redeployment
redeployment merge
Merge branch 'master' of https://hatraz.my.phpcloud.com/git/hatraz

Conflicts:
	data/SmartyModule/templates_c/3195658a481f9c3580d0684a862978ee8ab581a4.file.layout.tpl.php
	data/SmartyModule/templates_c/a6eede0827b7a4aeb59358dcbfa9ea53a74594e2.file.index.tpl.php
	module/Application/config/module.config.php
	module/Application/src/Application/Controller/IndexController.php
	module/Application/view/application/index/index.phtml
	module/Application/view/layout/layout.phtml
redeployment
redeployment merge