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
removed google_maps_api.xml
Added basic map functions
Merge pull request #4 from TobiTobsen92/master

added basic map functions