Merge branch 'master' of ssh://tbuschto@git.eclipse.org/gitroot/rap/org.eclipse.rap.tools.git Conflicts: bundles/org.eclipse.rap.doc/guide/articles/scripting.html