Favorites list is implemented with all drink data for now
Merge branch 'beta' of https://github.com/teamGaia/OneDrinkAway.git into beta
Merging project properties
Merge branch 'beta' of https://github.com/teamGaia/OneDrinkAway.git into
beta

Conflicts:
	OneDrinkAway/project.properties