Fixed change phone number test
Merge branch 'master' of https://github.com/instedd/resourcemap
Improved Change password test
Incomplete shared collection context