Added twig template
Merge remote-tracking branch 'origin/feature/add_twig'