Added waiter field in CustomerRequest and UserInfo tests
Merge remote-tracking branch 'upstream/master'
Changes to DiningSession and initial Customer Request functionality
(untested)
Merge remote-tracking branch 'upstream/master'

Conflicts:
	DineOnLibrary/src/uw/cse/dineon/library/Storable.java
CustomerRequest Toast works on both sides.
Merge remote-tracking branch 'upstream/master'
Merge pull request #160 from espeo196/master

CustomerRequest framework and Toasting works.
Added Parcelable Feature to User Application
Merge branch 'master' of https://github.com/blasv/DineOn into mh_beta_devel

Conflicts:
	DineOnLibrary/src/uw/cse/dineon/library/CustomerRequest.java
	DineOnLibrary/src/uw/cse/dineon/library/DiningSession.java
	DineOnLibrary/src/uw/cse/dineon/library/Menu.java
	DineOnLibrary/src/uw/cse/dineon/library/Order.java
	DineOnLibrary/src/uw/cse/dineon/library/RestaurantInfo.java
	DineOnLibrary/src/uw/cse/dineon/library/Storable.java
	DineOnLibrary/src/uw/cse/dineon/library/UserInfo.java
Fixed errors due to added fields