2.6.1
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
	src/servlet/frontend/teamRegist/DoRegist.java
Merge pull request #7 from CacheCake/master

合并