Merge branch 'templates' into 'testing'

added twig loginuserpass

See merge request !36
1 job for testing in 1 second (queued for 2 seconds)