Merge origin/master

Conflicts:
	composer.phar
	module/Application/src/Application/Controller/IndexController.php
	module/Application/view/application/index/index.phtml
	module/Application/view/layout/layout.phtml
	public/css/style.css