Merge pull request #1 from CacheCake/master

merge
4.2
4.4
4.6.1
Merge pull request #2 from GavinRL/master

0406验证码完成，Excle尚未完成
Merge pull request #3 from GavinRL/master

0406验证码完成，Excle尚未完成
4.6.2
Merge branch 'master' of https://github.com/panningwjr/Lolit into panningwjr-master

Conflicts:
	WebRoot/Front_End/Team_Apply/team_register.jsp
	WebRoot/WEB-INF/classes/servlet/frontend/teamRegist/DoRegist.class
	doc/error list.txt
Merge pull request #2 from CacheCake/master

同步