Merge branch 'master' of https://github.com/dongfangshuo/shuo.git

Conflicts:
	shuo-web/src/main/webapp/index.jsp
add index.jsp
pom