api key file ignored
Update google_maps_api.xml
.gitignore Api key files
api keys
Update .gitignore
gitignore
Update .gitignore
rm google_maps_api
added action bar button
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/src/debug/res/values/google_maps_api.xml
	app/src/release/res/values/google_maps_api.xml