Updated user management in activity
Merge branch 'master' of https://github.com/isics/OpenMiamMiam