worked on maps
Merge branch 'master' of https://github.com/shalomabitan/TrollApp

Conflicts:
	Troll/bin/R.txt
	Troll/bin/Troll.apk
	Troll/bin/classes.dex
	Troll/bin/classes/com/google/android/gms/R$drawable.class
	Troll/bin/classes/edu/ucsd/troll/app/AlertDialogManager.class
	Troll/bin/classes/edu/ucsd/troll/app/LocationMenuActivity$1.class
	Troll/bin/classes/edu/ucsd/troll/app/LocationMenuActivity$GetMenu.class
	Troll/bin/classes/edu/ucsd/troll/app/LoginActivity.class
	Troll/bin/classes/edu/ucsd/troll/app/MapsActivity$1.class
	Troll/bin/classes/edu/ucsd/troll/app/MapsActivity$2.class
	Troll/bin/classes/edu/ucsd/troll/app/MapsActivity$3.class
	Troll/bin/classes/edu/ucsd/troll/app/MapsActivity$4.class

Troll/bin/classes/edu/ucsd/troll/app/MapsActivity$ErrorDialogFragment.cl
ass
	Troll/bin/classes/edu/ucsd/troll/app/MapsActivity.class
	Troll/bin/classes/edu/ucsd/troll/app/ProfileActivity.class
	Troll/bin/classes/edu/ucsd/troll/app/R$drawable.class
	Troll/bin/classes/edu/ucsd/troll/app/R$id.class
	Troll/bin/classes/edu/ucsd/troll/app/R$integer.class
	Troll/bin/classes/edu/ucsd/troll/app/R$layout.class
	Troll/bin/classes/edu/ucsd/troll/app/R$menu.class
	Troll/bin/classes/edu/ucsd/troll/app/R$string.class
	Troll/bin/classes/edu/ucsd/troll/app/R$style.class
	Troll/bin/classes/edu/ucsd/troll/app/R$styleable.class
	Troll/bin/classes/edu/ucsd/troll/app/SignUpActivity.class
	Troll/bin/classes/edu/ucsd/troll/app/SingleMenuItemActivity$1.class
	Troll/bin/classes/edu/ucsd/troll/app/SingleMenuItemActivity$2.class
	Troll/bin/classes/edu/ucsd/troll/app/SingleMenuItemActivity.class
	Troll/bin/resources.ap_
	Troll/gen/com/google/android/gms/R.java
	Troll/gen/edu/ucsd/troll/app/R.java
	Troll/src/edu/ucsd/troll/app/MapsActivity.java
	Troll/src/edu/ucsd/troll/app/SingleMenuItemActivity.java