Merge branch 'dev' of https://github.com/mueees/maps into dev

Conflicts:
	app/frontend/dev/js/apps/editor/modules/EditProject/module/control/models/MainModel.js
	app/frontend/dev/js/apps/editor/modules/EditProject/module/control/module.js
	app/frontend/dev/js/apps/editor/modules/EditProject/module/control/templates/MainButtonsViewTemp.html
	app/frontend/dev/js/apps/editor/modules/EditProject/module/tab/module.js
	app/libs/logRequest.log