Made DrinkInfo call addRating and addToFavorites
Merge branch 'beta' of https://github.com/teamGaia/OneDrinkAway.git into
beta

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