Some stuff.
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Updated the Satellite to handle updated protocols
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.
..
..
Merge pull request #130 from espeo196/master

Strings changes to CustomerRequest
Updated the satellites.  Added more actions and changed protocols
Merge branch 'master' of https://github.com/blasv/DineOn
TimeStorable Fix???
Mock qr for Ms restaurant.
Merge pull request #131 from mhotan/master

Updated Gosh darn satellites
Merge branch 'master' of https://github.com/blasv/DineOn
removed this old one
Cleaned up login/create account screens to display correctly in
landscape mode.