Merge pull request #16 from CacheCake/master

merge
haha
3.31.3
数据分析后台完成
4.1.1
Merge pull request #18 from GavinRL/master

ShowLastTeam
Merge branch 'master' of https://github.com/panningwjr/Lolit

Conflicts:
	WebRoot/WEB-INF/classes/dao/impl/TeamImpl.class
	WebRoot/WEB-INF/classes/dao/interfaces/TeamDAO.class
Merge pull request #6 from CacheCake/master

接受0401合并文件