Merge branch 'templates' into 'testing'

added twig loginuserpass

See merge request !40
1 job for testing in 1 second (queued for 3 seconds)