Added geolocation functionality using gmaps API
Merge branch 'development'