Merge branch 'templates' into 'testing'

added twig files

See merge request !29
1 job for testing in 1 second (queued for 1 second)