Fixed errors resulting from changes in DrinkInterface
Merge branch 'master' of https://github.com/teamGaia/OneDrinkAway.git