Merge remote-tracking branch 'refs/remotes/upstream/master'

Conflicts:
	.gitignore
	.gitmodules
	composer.json
	module/Application/Module.php
	module/Application/config/module.config.php
	module/Application/view/error/404.tpl
	module/Application/view/error/index.phtml
	module/Application/view/index/index.tpl
	module/Application/view/layout/layout.phtml