Tests
Merge branch 'master' of https://github.com/blasv/DineOn
Merge pull request #221 from jordanmcnea22/master

Tests
Merge pull request #222 from glee23/master

Implemented sort by user tests
Fixed menus bugs and implemented pay bill feature
Merge branch 'master' of https://github.com/blasv/DineOn into mMaster
Merge pull request #223 from mrathjen/mMaster

Fixed menus bugs and implemented pay bill feature
Added Initial implementation for downloading and storing images in a
cache.
Updated the restaurant to use a static reference instead of parcelable
Merge branch 'master_backup' of https://github.com/mhotan/DineOn into phase_4_dev
God damn git
Merge branch 'master_backup' of https://github.com/mhotan/DineOn into master_backup
Merge branch 'master_backup' of https://github.com/mhotan/DineOn into phase_4_dev
Merge pull request #226 from glee23/master

Fixed sortby tests to pass
Merge pull request #224 from mhotan/phase_4_dev

Added Initial implementation for downloading and storing images in a cache