Fixed logic to persist an item to the cloud and small formatting changes
to Trophy Shelf and Inventory view
Disabled buttons when locate item/randomize is pressed, so user has to
wait for markers to render before clicking claim
Merge branch 'syqnew-master7'
Merge pull request #57 from syqnew/master

Fixed logic to persist an item to the cloud and small formatting changes
Merge pull request #58 from jennwu/master

resized images
Merge pull request #59 from jennwu/master

Added Carolyn's new images.
Merge branch 'master' of https://github.com/GoogleJump/Diversity
Changed the package name and this version is in alpha
Merge branch 'master' of https://github.com/GoogleJump/Diversity
Merge remote-tracking branch 'upstream/master'
removing proguard