Merge branch 'master' into chende

Conflicts:
	res/values/strings.xml
Merge branch 'master' into chende

Conflicts:
	res/values/strings.xml
流量限制
流量限制
Merge branch 'master' into chende
Merge remote-tracking branch 'origin/master' into chenyan

Conflicts:
	res/layout/set_router.xml
	res/values/strings.xml
	src/com/chainton/pdmclient/SetRouterActivity.java