83%
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	WifiTest/src/com/triman/wifitest/utils/netty/MessageClient.java