Merge branch 'master' of https://github.com/exaprint/cms-ui

Conflicts:
	module/Application/src/Application/Controller/AttributeController.php
	module/Application/src/Application/Controller/PrototypeController.php
	module/Application/view/attributes/render/text.phtml
	public/module/application/common/js/common.js