getFavorites() now works. favorites page doesnt crash
Merge branch 'beta' of https://github.com/teamGaia/OneDrinkAway.git into
beta

Conflicts:
	OneDrinkAway/src/com/onedrinkaway/app/DrinkInfoPage.java
	OneDrinkAway/src/com/onedrinkaway/app/FavoriteDrinks.java
Merge branch 'beta' of https://github.com/teamGaia/OneDrinkAway.git into beta