Added a few user model tests
fixed merge conflict
Merge pull request #15 from mdidier9/feature-googlemapz-da

Feature googlemapz da