Merge pull request #308 from mhotan/phase_4_dev

Death to Parcelable
Merge pull request #309 from mhotan/phase_4_dev

Added Image IO support for resource files
Merge branch 'master' of https://github.com/mhotan/DineOn into phase_4_dev