Merge branch 'master' into chende
Merge branch 'master' into chende
路由器设备管理
Merge branch 'master' into chende

Conflicts:
	res/values/strings.xml
Merge remote-tracking branch 'origin/master' into chenyan