Trying to add popup functionality
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
Refactored MapActivity and User
Merge branch 'clc4-master'
Changed API keys to the shared google account
Trying to fix PickCharacterActiviy.java
Preparing for merge
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
Merge remote-tracking branch 'upstream/master'

Conflicts:
	ParseStarterProject/src/com/parse/starter/MapActivity.java
	ParseStarterProject/src/com/parse/starter/User.java
Fixed a few bugs after merging
Added the UserInfo class to work around updating the ParseUser obj
Changed references of user to userInfo in Map and Puzzle activity.

NOT TESTED
Starting to debug the conversion from User to UserInfo
Making changes from code review