Merge branch 'master' into chende

Conflicts:
	src/com/chainton/pdmclient/ConnectDevicesActivity.java
	src/com/chainton/pdmclient/UserManageActivity.java
	src/com/chainton/pdmclient/adapters/ConnectDevicesAdapter.java
	src/com/chainton/pdmclient/xmpp/client/XMPPClient.java
删除用户之后跳转
。
Merge branch 'chenyan'

Conflicts:
	res/values/strings.xml
	src/com/chainton/pdmclient/ConnectDevicesActivity.java
Merge branch 'chenyan'
Merge branch 'chenyan'
Merge branch 'chenyan'
Merge branch 'chenyan'
流量限制
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 remote-tracking branch 'origin/master' into chenyan

Conflicts:
	res/layout/my_home.xml
	res/layout/net_way.xml
	res/layout/restart_router.xml
	res/layout/router_manager_login.xml
	res/layout/set_router.xml
	res/layout/synchronization_phone.xml
	res/values/strings.xml
	src/com/chainton/pdmclient/ConnectDevicesActivity.java
	src/com/chainton/pdmclient/FirstSetRouterLoadingActivity.java
	src/com/chainton/pdmclient/LoadingActivity.java
	src/com/chainton/pdmclient/LoginActivity.java
	src/com/chainton/pdmclient/MyHomeActivity.java
	src/com/chainton/pdmclient/NetSafetyActivity.java
	src/com/chainton/pdmclient/NetWayActivity.java
	src/com/chainton/pdmclient/RestartRouterActivity.java
	src/com/chainton/pdmclient/RouterManagerLoginActivity.java
	src/com/chainton/pdmclient/SelectRouterActivity.java