fix bug in password reset
resolve merge conflicts
Merge branch 'master' of github.com:schlubbi/IMI-Maps