Edited Search by Category so it populates itself with a temeporary list
of categories
Merge branch 'master' of https://github.com/teamGaia/OneDrinkAway.git

Conflicts:
	OneDrinkAway/src/com/onedrinkaway/app/TestData.java