changed to twig view
Merge branch 'master' into design_mun