Merge branch 'syqnew-master7'
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...
resolves merge conflicts
fixes package change in page curl view