4.2.1
Merge branch 'master' of https://github.com/panningwjr/Lolit into panningwjr-master

Conflicts:
	WebRoot/WEB-INF/classes/servlet/backend/committee/ShowTeamDataCount.class
	WebRoot/WEB-INF/web.xml
	src/servlet/backend/committee/ShowTeamDataCount.java
Revert "4.2.1"

This reverts commit 6870e97188640e0979e9aaf23a607a6d4ac85cd7.
Revert "4.1.3"

This reverts commit ff854d688f50a059d261055c0b4b858f7f4af1e7.
4.2.5
4.2.6
Merge pull request #1 from CacheCake/master

merge