Merge branch 'master' into chende

Conflicts:
	src/com/chainton/pdmserver/sharecircle/PdmServerMessageHandler.java
	src/com/chainton/pdmserver/threads/ClientMsgHandleThread.java
。
Merge branch 'chenyan'

Conflicts:
	src/com/chainton/pdmserver/sharecircle/PdmServerMessageHandler.java
	src/com/chainton/pdmserver/threads/ClientMsgHandleThread.java
Merge branch 'master' into chende

Conflicts:
	src/com/chainton/pdmserver/sharecircle/PdmServerMessageHandler.java
	src/com/chainton/pdmserver/threads/ClientMsgHandleThread.java
增加5G
增加打印Log
修改设置SSID密码之后的连接并且增加百度网盘的方法