BOTH_CONNECTED update
commit - working on delay
Merge commit '36ba009dc6c182de42f496a42829736ea168c8c0'

Conflicts:
	MSRA_MonitorTestApp/app/src/main/java/kr/ac/yonsei/winet/msra_monitortestapp/TrafficMonitor/ConnectivityHelper.java
Connectivity manager update