Use fake data to fill server page
Merge branch 'master' of https://github.com/2014-2/001

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