modified:   backend/src/expert_searcher.hpp
	modified:   backend/src/weibo.hpp
	modified:   backend/src/weiboimporter.cpp
	modified:   backend/src/weiboimporter.cpp
	modified:   backend/src/weiboimporter.cpp
	modified:   backend/src/pminer.hpp
	modified:   backend/src/pminerimporter.cpp
	modified:   backend/src/weiboimporter.cpp
	modified:   backend/src/weibo.hpp
	modified:   backend/src/weiboimporter.cpp
	modified:   backend/src/expert_searcher.hpp
	modified:   backend/src/pminer.hpp
	modified:   backend/src/search.cpp
	modified:   backend/src/weibo.hpp
	modified:   backend/src/weiboimporter.cpp
Update search.cpp
Merge remote-tracking branch 'hui/merge_upstream'

Conflicts:
	backend/src/expert_searcher.hpp
add style to search