Merge pull request #16 from CacheCake/master

merge
haha
数据分析后台完成
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