Added IngredientController and modified DrinkController to use @ResponseBody to automatically deliver JSON with Jackson.
Fixed ambiguous RequestMapping