Contains working favorites page, and changed the "price" on the menu
page to have more readable text. The price however is actually the
rating. Still need to fix that.
Update LoginManager.java

fixed createUserFavorites to correctly put KEY_FAVORITES instead of KEY_ID.
just added comment to test
updated the maps "view menu" button to work
Update SingleMenuItemActivity.java

Favorite/Unfavorite
Update LoginActivity.java
Update LoginManager.java
Update menu_single_item.xml
Merge remote-tracking branch 'origin/Kevin'

Conflicts:
	Troll/bin/R.txt
	Troll/bin/Troll.apk
	Troll/bin/resources.ap_
	Troll/project.properties
	TrollApp/Troll/bin/classes.dex
	TrollApp/Troll/bin/classes/android/support/v7/appcompat/R$attr.class
	TrollApp/Troll/bin/classes/android/support/v7/appcompat/R$bool.class
	TrollApp/Troll/bin/classes/android/support/v7/appcompat/R$color.class
	TrollApp/Troll/bin/classes/android/support/v7/appcompat/R$dimen.class
	TrollApp/Troll/bin/classes/android/support/v7/appcompat/R$id.class
	TrollApp/Troll/bin/classes/android/support/v7/appcompat/R$integer.class
	TrollApp/Troll/bin/classes/android/support/v7/appcompat/R$layout.class
	TrollApp/Troll/bin/classes/android/support/v7/appcompat/R$string.class
	TrollApp/Troll/bin/classes/android/support/v7/appcompat/R$style.class

TrollApp/Troll/bin/classes/android/support/v7/appcompat/R$styleable.clas
s
	TrollApp/Troll/bin/classes/com/google/android/gms/R$attr.class
	TrollApp/Troll/bin/classes/com/google/android/gms/R$color.class
	TrollApp/Troll/bin/classes/com/google/android/gms/R$id.class
	TrollApp/Troll/bin/classes/com/google/android/gms/R$integer.class
	TrollApp/Troll/bin/classes/com/google/android/gms/R$string.class
	TrollApp/Troll/bin/classes/com/google/android/gms/R$style.class

TrollApp/Troll/bin/classes/edu/ucsd/troll/app/ChangePasswordActivity.cla
ss
	TrollApp/Troll/bin/classes/edu/ucsd/troll/app/DiaryActivity.class
	TrollApp/Troll/bin/classes/edu/ucsd/troll/app/DiaryEdit.class

TrollApp/Troll/bin/classes/edu/ucsd/troll/app/FavoritesActivity$GetFavor
ites.class
	TrollApp/Troll/bin/classes/edu/ucsd/troll/app/FavoritesActivity.class

TrollApp/Troll/bin/classes/edu/ucsd/troll/app/LocationMenuActivity$1.cla
ss

TrollApp/Troll/bin/classes/edu/ucsd/troll/app/LocationMenuActivity$GetMe
nu.class

TrollApp/Troll/bin/classes/edu/ucsd/troll/app/LocationMenuActivity.class

TrollApp/Troll/bin/classes/edu/ucsd/troll/app/LocationServiceErrorMessag
es.class
	TrollApp/Troll/bin/classes/edu/ucsd/troll/app/LocationUtils.class
	TrollApp/Troll/bin/classes/edu/ucsd/troll/app/LoginActivity.class
	TrollApp/Troll/bin/classes/edu/ucsd/troll/app/LoginManager.class
	TrollApp/Troll/bin/classes/edu/ucsd/troll/app/MainActivity$1.class
	TrollApp/Troll/bin/classes/edu/ucsd/troll/app/MainActivity$2.class
	TrollApp/Troll/bin/classes/edu/ucsd/troll/app/MainActivity$3.class

TrollApp/Troll/bin/classes/edu/ucsd/troll/app/MainActivity$GetLocations.
class

TrollApp/Troll/bin/classes/edu/ucsd/troll/app/MainActivity$GetRandomFact
.class
	TrollApp/Troll/bin/classes/edu/ucsd/troll/app/MainActivity.class
	TrollApp/Troll/bin/classes/edu/ucsd/troll/app/MapsActivity.class
	TrollApp/Troll/bin/classes/edu/ucsd/troll/app/MenuActivity$1.class
	TrollApp/Troll/bin/classes/edu/ucsd/troll/app/MenuActivity.class

TrollApp/Troll/bin/classes/edu/ucsd/troll/app/PasswordRetrievalActivity.
class
	TrollApp/Troll/bin/classes/edu/ucsd/troll/app/ProfileActivity.class
	TrollApp/Troll/bin/classes/edu/ucsd/troll/app/R$attr.class
	TrollApp/Troll/bin/classes/edu/ucsd/troll/app/R$bool.class
	TrollApp/Troll/bin/classes/edu/ucsd/troll/app/R$color.class
	TrollApp/Troll/bin/classes/edu/ucsd/troll/app/R$dimen.class
	TrollApp/Troll/bin/classes/edu/ucsd/troll/app/R$id.class
	TrollApp/Troll/bin/classes/edu/ucsd/troll/app/R$integer.class
	TrollApp/Troll/bin/classes/edu/ucsd/troll/app/R$layout.class
	TrollApp/Troll/bin/classes/edu/ucsd/troll/app/R$menu.class
	TrollApp/Troll/bin/classes/edu/ucsd/troll/app/R$string.class
	TrollApp/Troll/bin/classes/edu/ucsd/troll/app/R$style.class
	TrollApp/Troll/bin/classes/edu/ucsd/troll/app/R$styleable.class
	TrollApp/Troll/bin/classes/edu/ucsd/troll/app/SignUpActivity.class

TrollApp/Troll/bin/classes/edu/ucsd/troll/app/SingleMenuItemActivity.cla
ss
	TrollApp/Troll/bin/jarlist.cache
	TrollApp/Troll/gen/android/support/v7/appcompat/R.java
	TrollApp/Troll/gen/com/google/android/gms/R.java
	TrollApp/Troll/gen/edu/ucsd/troll/app/R.java

google-play-services_lib/bin/classes/com/google/android/gms/R$styleable.
class