Servoy patch

Conflicts:
	features/org.eclipse.dltk.javascript-feature/feature.xml