Some stuff.
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
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
Changing Strings to CustomerRequests
Nothing really.
..
..
Merge pull request #130 from espeo196/master

Strings changes to CustomerRequest
Merge branch 'master' of https://github.com/blasv/DineOn