Merge pull request #1 from wayne0332/master

项目已经更新
Merge pull request #4 from wayne0332/master

项目已经更新
Merge pull request #5 from torrytang/master

Merge pull request #1 from wayne0332/master
9.4.1
9.15.1
Merge branch 'master' of https://github.com/wayne0332/xiaojh into wayne0332-master

Conflicts:
	WebRoot/WEB-INF/web/forepart/userCenter.jsp
Merge pull request #10 from CacheCake/master

前端第一阶段实现