GBK -> UTF8
init
init
Merge branch 'master' of https://github.com/nathanleewei/platform

Conflicts:
	diamond/diamond-server/target/classes/jdbc.properties
	diamond/diamond-server/target/classes/user.properties
	tddl/tddl-common/target/classes/tddl-log4j.xml
	tddl/tddl-sample/target/classes/寤哄簱寤鸿〃sql璇彞.txt