error correction
Merge remote-tracking branch 'origin/Interface' into Temporary-Merge-Branch

Conflicts:
	src/rarus/eatery/database/EateryDB.java
Merge remote-tracking branch 'origin/Temporary-Merge-Branch' into WebService