mods for google play services
Merge branch 'master' of https://github.com/mpieler/booglers into michelle

Conflicts:
	app/build.gradle
	app/src/main/AndroidManifest.xml
merge
maps API partial