Merge branch 'syqnew-master7'
adding some artwork
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
added new images from carolyn
added in transition to pickchar
fixes some bug changes like stopping the addition of user info objects when unauthenticated
Merge pull request #59 from jennwu/master

Added Carolyn's new images.
resizing images
resizing images stuff
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
added correct order of dialogs, way to check capital letters in anagrams, background for splashscreen
unfroze buttons when no materials to collecdt
Merge remote-tracking branch 'upstream/master'
removing proguard
fixed transition
Merge pull request #61 from jennwu/master

added correct order of dialogs, way to check capital letters in anagrams...
adds help button