Commit 5fe98259e08dd1b47fd22d80ed17f9ada4b37474

Merge branch 'master' of git.pantoto.org:user-management/user-management

Conflicts:
	database.py