Merge branch 'dev' of ssh://github.com/shardingjdbc/sharding-jdbc into dev

# Conflicts:
#	pom.xml
#	sharding-core/src/main/java/io/shardingsphere/core/yaml/proxy/YamlProxyConfiguration.java
#	sharding-proxy/src/main/java/io/shardingsphere/proxy/config/RuleRegistry.java