Merge branch 'master' into chende

Conflicts:
	src/com/chainton/pdmclient/ConnectDevicesActivity.java
	src/com/chainton/pdmclient/SetRouterActivity.java
	src/com/chainton/pdmclient/UserManageActivity.java
	src/com/chainton/pdmclient/adapters/ConnectDevicesAdapter.java
	src/com/chainton/pdmclient/view/custom/TrafficLimitDialog.java
	src/com/chainton/pdmclient/xmpp/client/XMPPClient.java
Merge branch 'master' into chende