Modify dialog tips
Merge branch 'master' of https://github.com/2014-2/001

Conflicts:
	CRTBTunnelMonitor/src/com/crtb/tunnelmonitor/utils/ConPopuWindow.java
Merge branch 'master' of https://github.com/2014-2/001