Fix labels
Fix cms name
fix
Merge branch 'dev' into datasource

Conflicts:
	cms/modules/installer/classes/controller/install.php