Merge pull request #5 from CacheCake/master

merge
Merge pull request #6 from CacheCake/master

merge
4.17
4.18
Merge pull request #7 from CacheCake/master

merge
4.19
4.21
4.22.1
4.23
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