webTest
statis data & entity update
summarize page data inject
keylist
user login control
loginWeb
login
login

little
Merge branch 'master' of https://github.com/sihuoteam/opinionmonitor

Conflicts:
	WebRoot/loginWeb.jsp
nothing
n
user update & thrift added
Merge branch 'master' of https://github.com/sihuoteam/opinionmonitor
article class change
keyword list page update
thrift
lucene update: add merge & cache police
thrift client
keylist
spider update