Temporary map api commit
Merge branch 'master' of https://github.com/keveleigh/bagboy-android

Conflicts:
	AndroidManifest.xml