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

Conflicts:
	src/main/resources/jdbc.properties