Merge remote-tracking branch 'origin/master'

Conflicts:
	jquery.sce24.examples/content/js/app/common.js
Merge remote-tracking branch 'origin/master'