bugfixed
bugfixed
Merge branch 'master' of https://github.com/bjlvyanmeng/lgb

Conflicts:
	src/main/webapp/WEB-INF/velocity/front/index.vm