new file:   backend/build/user.lic
	modified:   src/aminerdata.cpp
	modified:   src/aminerdata.hpp
	modified:   src/expert_searcher.cpp
Merge remote-tracking branch 'upstream/master' into merge_upstream

Conflicts:
	backend/src/expert_searcher.cpp

	modified:   backend/src/CMakeLists.txt
	modified:   backend/src/aminerdata.cpp
	modified:   backend/src/aminerdata.hpp
	modified:   backend/src/expert_searcher.hpp
	deleted:    backend/src/group_searcher.cpp
	modified:   backend/src/group_searcher.hpp
	modified:   backend/src/main.cpp
	modified:   backend/src/pminer.hpp
	modified:   backend/src/pminerdata.hpp
	modified:   backend/src/pminerimporter.cpp
	modified:   backend/src/search.cpp
	modified:   backend/src/search.hpp
	new file:   backend/src/support_doc_searcher.hpp
	deleted:    backend/src/user_searcher.cpp
	modified:   backend/src/user_searcher.hpp
	modified:   backend/src/weibo.hpp
	modified:   backend/src/weibodata.cpp
	modified:   backend/src/weibodata.hpp
	deleted:    backend/src/expert_searcher.cpp
	modified:   backend/src/expert_searcher.hpp
add patent influence
add group search by id
fix saeclient bug
merge people name search from hui

Merge remote-tracking branch 'hui/merge_upstream'
restore network integration deleted by ling