Inserted control areas
Merge branch 'development' of https://github.com/Tokimon/cms into development

Conflicts:
	cms/js/cms.js
	cms/public workfiles/js/cms.js