Changed drinkinfo page to work with DrinkInfo and to get a drink object
from other pages
Merge branch 'master' of https://github.com/teamGaia/OneDrinkAway.git

Conflicts:
	OneDrinkAway/src/com/onedrinkaway/app/DrinkInfoPage.java