Updated documentation for Search By Flavor
Merge branch 'master' of https://github.com/teamGaia/OneDrinkAway.git
Search By Ingredients displays cheeses with checkboxes
Merge branch 'master' of https://github.com/teamGaia/OneDrinkAway.git

Conflicts:
	OneDrinkAway/project.properties
	OneDrinkAway/src/com/onedrinkaway/app/SearchByIngredient.java