add simple favicon
Merge branch 'master' into feature/loginpage-focus-username-input

Conflicts:
	templates/layout.html