TwigController renamed to MockupController
Merge branch 'development' of github.com:Indholdskanalen/indholdskanalen into development

Conflicts:
	app/Resources/views/base.html.twig
	app/Resources/views/loggedin.html.twig