Merge branch 'master' of https://github.com/opencloudb/Mycat-Server

Conflicts:
	src/main/java/org/opencloudb/mpp/DataMergeService.java
在配置文件中增加sharding-murmur-hash
Merge branch 'master' of https://github.com/runfriends/Mycat-Server