Fixed sort by tests to pass
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
Cleaned up the restaurant profile placeholder menu items.
Added content descriptions
Centers the image.
Fixed trailing zero price display bug.
Merge pull request #227 from glee23/master

Cleaned up restaurant profile menu items
Merge pull request #229 from mhotan/phase_4_dev

Updated library
Swapped TestUtility to live in the Library instead of the old
semi-working one. Also, some style fixes.
Merge remote-tracking branch 'upstream/master'
User edit profile layout.
fragments for profile.
Merge branch 'master' of https://github.com/espeo196/DineOn
Changed the interface to the static variables. Fixed some checkstyle
warnings and got rid of dead code.
Fixed logic problem
Stupid checkstyle
added the basics for the profile stuff. need to fill in the blanks.
Merge pull request #230 from mrathjen/mMaster

Changed the interface to the static variables. Fixed some checkstyle
Merge branch 'master' of https://github.com/blasv/DineOn

Conflicts:
	DineOnUserApplication/src/uw/cse/dineon/user/DineOnUserActivity.java
	DineOnUserApplication/src/uw/cse/dineon/user/bill/CurrentBillFragment.java
	DineOnUserApplication/src/uw/cse/dineon/user/bill/CurrentOrderFragment.java
	DineOnUserApplication/src/uw/cse/dineon/user/restaurantselection/RestaurantSelectionActivity.java