MapsActivity edit.
Merge branch 'working' of https://github.com/AllAmericanBadGirls/BrockButler into working

Conflicts:
	app/BrockButler/src/edu/seaaddicts/brockbutler/maps/MapsActivity.java