Merge branch 'templates' into 'testing'

added admin loginform

See merge request !43
3 jobs for testing in 1 second (queued for 1 second)