temp
price filtering done
search key replaced
Merge branch 'ui3'
search-bar
Merge branch 'ui3'
Merge branch 'master' of https://github.com/CXCS130-Fall-2014/cxcatalogapi