Merge branch 'new_layout' into 'testing'

changed ids for login form

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