Implemented getDrinks(Query)
Merge branch 'beta' of git@github.com:teamGaia/OneDrinkAway.git into beta