Add UpdateActivity and modify UI of new control point view
crash fix
TODO: find the current WorkPlan
Merge branch 'master' of https://github.com/2014-2/001

Conflicts:
	CRTBTunnelMonitor/src/com/crtb/tunnelmonitor/activity/AsregardsActivity.java