finish filter search button
Merge pull request #39 from usc-588/filterDisplay2

finish filter search button
Merge branch 'master' of github.com:usc-588/application-smart-recommendation into backList

Conflicts:
	SmartRecomm/SmartRecomm.storyboard
	SmartRecomm/mapTableViewController.m