added pricing
added pricing and made sure everything works
Modified the map to output GPS/Network off message
Fixed the lastKnownLocation checking for nullity
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
I think I just merged the code correctly w S&M's
Merge branch 'master' into Ahmed
Incorporated Alex's diary and other stuff