Merge branch 'master' into chende

Conflicts:
	res/values/strings.xml
联网方式
Merge remote-tracking branch 'origin/master' into chenyan
找回密码
显示密码
流量限制
Merge branch 'master' of https://github.com/chainton/pdm-client.git
限制流量
修改
Merge branch 'master' of https://github.com/chainton/pdm-client.git

Conflicts:
	src/com/chainton/pdmclient/ConnectingDeviceActivity.java
	src/com/chainton/pdmclient/SetRouterActivity.java
Merge branch 'master' into chende

Conflicts:
	res/values/strings.xml