Trying to mergr admin ui
Merge remote-tracking branch 'origin/newJs' into newJs

Conflicts:
	app/utils/CMS/CMS.java
	conf/evolutions/default/1.sql