rebuild
Merge branch 'develop' of github.com:chenzhizdt/wifitest into develop
12
更新了主界面，同时更改了底层通信模块
complete 80%
complete 81%
82%
83%
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	WifiTest/src/com/triman/wifitest/utils/netty/MessageClient.java
Merge branch 'develop'