Add support for Twig templates
Change views to Twig templates
Merge branch 'feature/web-layout' into develop