消警修改
Merge branch 'master' of https://github.com/2014-2/001

Conflicts:
	CRTBTunnelMonitor/res/values/strings.xml