logback
Merge branch 'master' of https://github.com/yuelaotou/wsun.git

Conflicts:
	src/main/resources/logback.xml