。
Merge branch 'chenyan'

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