add data set selection
Merge branch 'master' of github.com:THUKEG/saedemo
added patent knowledge drift
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
fix integrate template
fix user search
fix knowledge drifting

use external saeclient
fix weibo url
merge patent trends, fix some bug

Merge remote-tracking branch 'neo/master'
add hot query
fix file permissions introduced by ling's commit
fix pminer logo; add default img on error
Merge remote-tracking branch 'upstream/master' into merge_upstream

Conflicts:
	backend/src/expert_searcher.hpp

	modified:   backend/src/expert_searcher.hpp
	modified:   backend/src/main.cpp
	modified:   backend/src/pminerimporter.cpp
	modified:   backend/src/search.cpp
	modified:   backend/src/search.hpp