combining logins
Google Maps Implemented
Merge branch 'googlemap-2'

Conflicts:
	EatUBC/AndroidManifest.xml
	EatUBC/project.properties
	EatUBC/res/values/strings.xml
merging

googlemap and master