#: Google API for Maps
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidManifest.xml
	res/layout/main.xml
	src/com/example/geoSocial/MyActivity.java