Login Screen Template
Merge branch 'ux' into dev

Conflicts:
	templates/_base.html
	templates/registration/login.html
	templates/timeline.html