Created beta branch
added beta branch
Small change, just making sure beta branch is working right
Added build.xml, project should be buildable with ant now
Updates to DrinkDb and DrinkData. App currently checks for serialized
image of DrinkData, and if it doesn't find it, reads in the data from
RecipesBeta.txt and drinks.tsv. Tell me if this causes any problems for
anyone!

Also made DrinkData properly singleton (private constructor, private
static instance field)
I have to commit this for some reason
Merge branch 'beta' of https://github.com/teamGaia/OneDrinkAway.git into
beta

Conflicts:
	OneDrinkAway/project.properties
fav drinks
Merge branch 'beta' of https://github.com/teamGaia/OneDrinkAway into beta

Merging my branch with beta
Update KNearestNeighborModel.java

Change the constructor
Added help menu messages to HomePage, Category, and Ingredients. 

All help menus are complete!
Merge branch 'beta' of https://github.com/teamGaia/OneDrinkAway.git into beta
Implemented getDrinks(Query)
Merge branch 'beta' of git@github.com:teamGaia/OneDrinkAway.git into beta
Search By Ingredient checkbox listeners fixed
Merge branch 'beta' of https://github.com/teamGaia/OneDrinkAway.git into beta
Search By Ingredient uses getAllDrinks so that it doesn't crash
Search By Category now has onLongClick() which displays help dialog
Merge branch 'beta' of https://github.com/teamGaia/OneDrinkAway.git into beta
Results page has correct title when going from Search By Ingredients