Changes to server test
Merge branch 'master' of git@github.com:teamGaia/JavaUnitTests.git
Updates tests to reflect updates to database schema, DrinkInfo and Drink
class.