merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	jquery.sce24.examples/.settings/org.eclipse.core.resources.prefs