modified:   CRTBTunnelMonitor/res/layout/activity_login.xml
	modified:   CRTBTunnelMonitor/src/com/sxlc/activity/LoginActivity.java
Merge branch 'master' of github.com:2014-2/001