Delete googleapis.js
Geolocation and Google Maps Working
deleted file
Merge branch 'gh-pages'

Conflicts:
	ios/www/js/libs/googleapis.js
final commit
Merge branch 'master' into gh-pages