Merge pull request #124 from jordanmcnea22/master

checkin works
Some stuff.
Merge remote-tracking branch 'upstream/master'
Added expanding list items to Restaurant-side Orders
Merge pull request #125 from glee23/master

Added expanding lists to restaurant side orders
Added DiningSessionTest and edited ApplicationManifest to correct test
settings
Fix to test project properties
Merge remote-tracking branch 'upstream/master'
Merge pull request #126 from zachr81/master

DiningSession test added
Added dummy unit test for User app
Merge pull request #127 from mrathjen/mMaster

Added dummy unit test for User app
Updated the Satellite to handle updated protocols
Added emma jar to classpath
Merge branch 'master' of https://github.com/blasv/DineOn into mMaster
Merge pull request #128 from mrathjen/mMaster

Added emma jar to classpath
Merge branch 'mh_beta_devel' of https://github.com/mhotan/DineOn

Conflicts:
	DineOnLibrary/src/uw/cse/dineon/library/TimeableStorable.java
Changing Strings to CustomerRequests
Updated Satellite for User side.  4 more actions and cleaner (modestly)
code
Nothing really.
..