resolves merge conflicts
fixes package change in page curl view
fixed inventory problems and added some back logic
 fixed merge
Merge pull request #63 from clc4/master

fixes photo album for new package
PANDASSSSS
Merge pull request #65 from ashleyjihye4/master

HelpActivity and PickCharacterActivity
Merge pull request #64 from jennwu/master

fixed inventory problems and added some back logic
adds grandma final
add focusing on markers on create map
Merge branch 'master' of https://github.com/GoogleJump/Diversity
Merge pull request #67 from clc4/master

adds grandma final
Changed 2nd help button to about button
Merge branch 'master' of https://github.com/GoogleJump/Diversity
merging