Update to person controller
Merge branch 'master' into KAPI-2

Conflicts:
	app/models/Drink.java
Update to Keg Controller
Added DrinkController and updated keg and person.
Merge branch 'KAPI-2'

Conflicts:
	app/controllers/KegController.java