添加控制点的删除
Merge branch 'master' of https://github.com/2014-2/001.git

解决冲突
Conflicts:
	CRTBTunnelMonitor/src/com/crtb/tunnelmonitor/activity/ControlPointsActivity.java