changed search_api model to work for category filter and location
Merge pull request #13 from RossWittenberg/search_api

changed search_api model to work for category filter and location
Merge branch 'master' into bars

Conflicts:
	search_bar_app/app/models/search_api.rb