Inheriting application controller so the engine gets the layout from the app
Merge branch 'features/inheriting-application-controller'