Got google maps api authorization working
Merge branch 'master' of http://github.com/rjrosale/partynow

Conflicts:
	AndroidManifest.xml