Brief changes to search by category. results page is broken and working
on fixing it
Merging
Merge branch 'beta' of https://github.com/teamGaia/OneDrinkAway.git into
beta

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