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
load partition optimize
change key word in search
Merge branch 'master' into popular_tags_with_db

Conflicts:
	ranking/src/ranking/ranking.java