Merge branch 'r1-dev' of
https://github.com/nlaplante/angular-google-maps.git into r1-dev
Merge branch 'r1-dev' of https://github.com/nlaplante/angular-google-maps.git into r1-dev