Merge branch 'master' into chende

Conflicts:
	src/com/chainton/pdmserver/threads/ClientMsgHandleThread.java
	src/com/chainton/pdmserver/xmpp/client/XMPPClient.java
.
Merge branch 'master' of https://github.com/chainton/pdm-server.git

Conflicts:
	src/com/chainton/pdmserver/router/Router.java
Merge branch 'chenyan'

Conflicts:
	src/com/chainton/pdmserver/httpclient/HttpRouterCommandExecutor.java
	src/com/chainton/pdmserver/router/Router.java
	src/com/chainton/pdmserver/threads/ClientMsgHandleThread.java
Merge branch 'chenyan'
Merge branch 'chenyan'
Merge branch 'chenyan'
Merge branch 'chenyan'

Conflicts:
	src/com/chainton/pdmserver/router/Router.java
流量限制
Merge branch 'master' into chende

Conflicts:
	src/com/chainton/pdmserver/MainActivity.java
	src/com/chainton/pdmserver/httpclient/HttpRouterCommandExecutor.java
	src/com/chainton/pdmserver/router/Router.java
	src/com/chainton/pdmserver/sharecircle/PdmServerMessageHandler.java
	src/com/chainton/pdmserver/threads/ClientMsgHandleThread.java
	src/com/chainton/pdmserver/xmpp/client/XMPPClient.java