config fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	engine/src/main/resources/META-INF/applicationContext.xml
ui deployment