0.11
	modified:   app/models/google_maps.rb
0.11
	modified:   app/models/google_maps.rb
Merge branch 'master' of https://github.com/nomadop/api_proxy

Conflicts:
	app/models/google_maps.rb