Work on changing maps.
Merge branch 'A1' of github.com:jdarling91/allplayers-android into addSideNavInheritance

Conflicts:
	AndroidManifest.xml
	project.properties
	res/layout/eventdetail.xml
	res/layout/group_location.xml
	src/com/allplayers/android/EventDisplayActivity.java
	src/com/allplayers/android/GroupLocationActivity.java
	src/com/allplayers/android/MessageThread.java
Merge branch 'A1' of github.com:jdarling91/allplayers-android into addSideNavInheritance

Conflicts:
	res/layout/eventdetail.xml
	src/com/allplayers/android/EventDisplayActivity.java
	src/com/allplayers/android/GroupLocationActivity.java
Fixed group page layout.
Removed some now unused debugging code.
Merge branch 'addSideNavInheritance' of https://github.com/icowley/allplayers-android into A1
Reestablished changes in Login.java.