Login fix
Merge branch 'master' of https://github.com/FelixHolzaepfel-Stein/MatseGrp10

Conflicts:
	templates/login.tpl
Merge branch 'master' of https://github.com/FelixHolzaepfel-Stein/MatseGrp10

Conflicts:
	templates/login.tpl