Fixed some bugs and got rid of all the headers
Changed all instances of saving to saveEventually
Updated the version of the Parse jar
Moved warning dialog and checking for internet connection to
BaseActivity
Warning messages were put into strings.xml
Added a loading dialog in pickCharacter
trying to xif reset
Merge branch 'master' of https://github.com/syqnew/Diversity into syqnew-master
merge
merging stephs changes
merge fixes
Merge branch 'ashleyjihye2-master1'
a