added google maps service
resolved conflicts
Merge branch 'master' of https://github.com/DogWalkers/htn-angular