Merge origin/_aro_new

Conflicts:
	cp/themes/constellation/layout/css/custom.css
	system/protected/views/back/layouts/main.php