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

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