various user management changes
Merge branch 'master' of https://github.com/GDGCapeTown/relieflifemap