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

Conflicts:
	module/Application/view/application/prototype/new.phtml