Orders now use CurrentOrderItems and not MenuItems.
Merge branch 'master' of https://github.com/blasv/DineOn into mMaster
Add support for emulator with location services.
Merge pull request #248 from mrathjen/mMaster

Orders now use CurrentOrderItems and not MenuItems.
Merge pull request #247 from mhotan/phase_4_dev

Images partially working
More User Profile editing.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	DineOnLibrary/src/uw/cse/dineon/library/image/ImageIO.java
Don't get location if running restaurant on emulator.
Merge pull request #249 from mrathjen/mMaster

Don't get location if running restaurant on emulator.
Merge remote-tracking branch 'upstream/master'
User Profile finished. Email, phone, and password changing functionality
implemented.
Slight layout change to edit profile.
Fixed bug. Forgot to call .packObject on MenuItem in Order
Merge branch 'master' of https://github.com/blasv/DineOn into mMaster
Merge pull request #250 from espeo196/master

Editable User Profile Mk II
Merge pull request #251 from mrathjen/mMaster

Fixed bug. Forgot to call .packObject on MenuItem in Order
Merge branch 'master' of https://github.com/mhotan/DineOn into phase_4_dev

Conflicts:
	DineOnUserApplication/res/values/strings.xml
	DineOnUserApplication/src/uw/cse/dineon/user/DineOnUserActivity.java