no message
Merge branch 'master' of https://github.com/HanYu1983/TestJavaWeb

Conflicts:
	eclipse/FuBang/WebContent/20140902/js/search.js
	eclipse/FuBang/WebContent/20140902/js/vote.js
	eclipse/FuBang/WebContent/20140902/js/vote_info.js