Tilføjet google map
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/dk/ba/bastampcard/activities/MainActivity.java
	app/src/main/res/menu/main.xml
	app/src/main/res/values/strings.xml