3.2 map

maps
Merge remote-tracking branch 'origin/master'

Conflicts:
	OsuFootPrint3.0/app/src/main/AndroidManifest.xml
	OsuFootPrint3.0/app/src/main/res/values/strings.xml