GPSActivity kind of started

Committing to save info... not useful
merge conflicts resolved.
merge conflict resolved
just merged with master
doing some small thing to merge
Pushing settings up
made main menu connect to character view
Added some comments
popups on settings done, popups on puzzle work in progress
popups done but with some issues
Popups working for settings and puzzle

Some activity names will need to be changed once other people's parts
are merged!!!

Also, I have issues with saveInBackground

READY FOR CODE REVIEW
just doing something dumb
merge conflicts
Post code review

Missing parts of code review because my eclipse broke.
fixed for code review and findInBackground; saveInBackground still has problems
Merge branch 'master' of https://github.com/jennwu/Diversity into jennwu-master

Conflicts:
	ParseStarterProject/.classpath
	ParseStarterProject/AndroidManifest.xml
	ParseStarterProject/gen/com/parse/starter/R.java
	ParseStarterProject/project.properties
	ParseStarterProject/res/values/strings.xml
	ParseStarterProject/src/com/parse/starter/InventoryActivity.java
	ParseStarterProject/src/com/parse/starter/User.java
Preparing to merge with master
Merge branch 'jennwu-master'
Implemented code review changes and other clean up
App tested. Removed default header from all views