Merge branch 'master' into Ahmed
committing recent changes
Merge branch 'master' into Ahmed

Conflicts:
	Troll/bin/R.txt
	Troll/bin/Troll.apk
	Troll/bin/classes.dex
	Troll/bin/classes/android/support/v7/appcompat/R$layout.class
	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/LocationMenuActivity.class
	Troll/bin/classes/edu/ucsd/troll/app/LocationUtils.class
	Troll/bin/classes/edu/ucsd/troll/app/LoginActivity.class
	Troll/bin/classes/edu/ucsd/troll/app/MainActivity$1.class
	Troll/bin/classes/edu/ucsd/troll/app/MainActivity$2.class
	Troll/bin/classes/edu/ucsd/troll/app/MainActivity$3.class
	Troll/bin/classes/edu/ucsd/troll/app/MainActivity$GetRandomFact.class
	Troll/bin/classes/edu/ucsd/troll/app/MainActivity.class

Troll/bin/classes/edu/ucsd/troll/app/MapsActivity$ErrorDialogFragment.cl
ass
	Troll/bin/classes/edu/ucsd/troll/app/MapsActivity$GetLocations.class
	Troll/bin/classes/edu/ucsd/troll/app/MapsActivity.class
	Troll/bin/classes/edu/ucsd/troll/app/MenuActivity$1.class
	Troll/bin/classes/edu/ucsd/troll/app/MenuActivity.class
	Troll/bin/classes/edu/ucsd/troll/app/ProfileActivity$3.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/dexedLibs/android-support-v4-bcb2147a4ababda4562b75bf8cb31dd6.
jar

Troll/bin/dexedLibs/android-support-v7-appcompat-176bc804699134aadc05479
8becab3f4.jar

Troll/bin/dexedLibs/android-support-v7-appcompat-a714d3a51f57f6536b6e6ec
f030bb9aa.jar

Troll/bin/dexedLibs/google-play-services-08a327414feb04fb57a4bdd5b687408
3.jar

Troll/bin/dexedLibs/google-play-services_lib-e5eb1253bb1207a030aeb31f302
603b6.jar
	Troll/bin/jarlist.cache
	Troll/bin/resources.ap_
	Troll/gen/android/support/v7/appcompat/R.java
	Troll/gen/com/google/android/gms/R.java
	Troll/gen/edu/ucsd/troll/app/R.java
	Troll/res/layout/dialogue_menu_navigate.xml
	Troll/res/layout/maps_layout.xml
	Troll/src/edu/ucsd/troll/app/MapsActivity.java
	appcompat_v7/bin/android-support-v7-appcompat.jar
Attempted to merge code with Sachi, and survived
Added Kevins changes the attached filename in desc

AndroidManifest
location_menu_list
LocationMenuActivity
menu_single_item
SingleMenuItemActivity
Added Sachi & Morgan's (and Alex's) code into hub
Merge branch 'Ahmed'

Conflicts:
	Troll/bin/R.txt
	Troll/bin/Troll.apk
	Troll/bin/classes.dex
	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/LocationMenuActivity.class
	Troll/bin/classes/edu/ucsd/troll/app/LoginActivity.class
	Troll/bin/classes/edu/ucsd/troll/app/LoginManager.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/MenuActivity$1.class
	Troll/bin/classes/edu/ucsd/troll/app/MenuActivity.class
	Troll/bin/classes/edu/ucsd/troll/app/ProfileActivity.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$3.class

Troll/bin/classes/edu/ucsd/troll/app/SingleMenuItemActivity$SetRating.cl
ass
	Troll/bin/classes/edu/ucsd/troll/app/SingleMenuItemActivity.class
	Troll/bin/dexedLibs/appcompat_v7-230a5f7ece669b6ee7c93f3cf650db36.jar

Troll/bin/dexedLibs/google-play-services_lib-de00f2ec3596e0cb33c0ceeee68
71061.jar

Troll/bin/dexedLibs/google-play-services_lib-e5eb1253bb1207a030aeb31f302
603b6.jar
	Troll/bin/resources.ap_
	Troll/gen/edu/ucsd/troll/app/R.java
	Troll/src/edu/ucsd/troll/app/LocationMenuActivity.java
	Troll/src/edu/ucsd/troll/app/SingleMenuItemActivity.java
	appcompat_v7/bin/android-support-v7-appcompat.jar
	appcompat_v7/bin/appcompat_v7.jar