Merge origin/brunch-first into brunch-first

Conflicts:
	module/Application/src/Application/Controller/IndexController.php
Merge origin/brunch-first into brunch-first

Conflicts:
	module/Application/src/Application/Controller/IndexController.php