Show user info in UserInfoActivity
Merge branch 'master' of https://github.com/2014-2/001

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