Merge pull request #5 from CacheCake/master

merge
Merge pull request #6 from CacheCake/master

merge
4.17
4.18.1
4.18
Merge pull request #10 from GavinRL/master

0418 IE版本 登陆成功页面完成
4.18.2
Merge pull request #7 from CacheCake/master

merge
4.19
4.21
4.22.1
4.22.1
4.23.1
4.23
4.23.2
Merge branch 'master' of https://github.com/GavinRL/Lolit into GavinRL-master

Conflicts:
	WebRoot/Front_End/Team_Apply/team_regist_success.jsp
	WebRoot/Front_End/front_end_prompt.jsp
	WebRoot/Front_End/front_end_prompt_ie.jsp
	WebRoot/WEB-INF/classes/servlet/frontend/teamRegist/ShowLastTeam.class
	src/servlet/frontend/teamRegist/ShowLastTeam.java
4.23.3
4.23.4
Merge branch 'master' of https://github.com/panningwjr/Lolit

Conflicts:
	WebRoot/Front_End/Team_Apply/team_regist_success.jsp
	WebRoot/Front_End/Team_Apply/team_register_ie.jsp
4.24.1