Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/com/mes/util/ytnetty/QmResultUtil.java
#	src/com/mes/util/ytnetty/YtNettyClientHandler.java