初始化
Merge branch 'master' of https://github.com/kuangzhiqin/justice

Conflicts:
	logs/all.log
	logs/debug.log
	logs/error.log
	logs/mybatis.log
	logs/spring.log