Login error.
Merge branch 'master' of https://github.com/michaeltricht/IPSEN5

Conflicts:
	db.sqlite3