The WiFi error is corrected
Merge commit 'c3acf6e1f281853e24c16078c8951893119a01fb'

Conflicts:
	MSRA_MonitorTestApp/app/src/main/java/kr/ac/yonsei/winet/msra_monitortestapp/TrafficMonitor/ConnectivityHelper.java
Alpha ver.1