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
Merge pull request #33 from syqnew/master

Implemented MapsActivity
updates trophy shelf, photo album, and inventory views. Photo album has some memory leaks. Also, fixes a small bug in User.
updates trophy shelf, photo album, and inventory views. Photo album has some memory leaks. Also, fixes a small bug in User.
resolves merge conflicts
just doing something dumb
merge conflicts
Merge branch 'clc4-master'
Changed API keys to the shared google account
Post code review

Missing parts of code review because my eclipse broke.