adding static google map api functionality
Merge branch 'master' into google_api

Conflicts:
	app/views/stops/index.html.erb