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