qcity
Merge branch 'master' of https://github.com/iacdingping/qsync

Conflicts:
	qsync-api/src/main/java/com/openteach/qsync/api/JkfClientOverFtp.java
	qsync-core/src/main/resources/schame/mysql.sql