Merge branch 'master'

Conflicts:
	$APP_CONFIG$/editor.xml
	$APP_CONFIG$/other.xml
	$APP_CONFIG$/project.default.xml
Reset to my
Merge branch 'master'