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

Conflicts:
	DineOnLibrary/src/uw/cse/dineon/library/image/ImageIO.java
Merge remote-tracking branch 'upstream/master'
User Profile finished. Email, phone, and password changing functionality
implemented.
Slight layout change to edit profile.
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
More user profile stuff.
Network calls are not made unless fields are actually changed and the
basic
profile page displays the user's email and phone number.
favorite stuff for restaurant home
Merge branch 'master' of https://github.com/blasv/DineOn
Implemented action bar search
Slight modification for search
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
Merge pull request #252 from espeo196/master

More user profile stuff.
Merge branch 'master' of https://github.com/mhotan/DineOn into phase_4_dev
Merge pull request #253 from mhotan/phase_4_dev

Search bar in user app
Create the bill from all user orders in dining session.
Merge branch 'master' of https://github.com/blasv/DineOn into mMaster

Conflicts:
	DineOnUserApplication/src/uw/cse/dineon/user/DineOnUserActivity.java
favorites now work.
Merge branch 'master' of https://github.com/blasv/DineOn