Removed enums from Drink, added support for multiple categories per
drink
DrinkData
Merge branch 'master' of git@github.com:teamGaia/OneDrinkAway.git