add sn,userid
小新状态改变
modify
Merge branch 'master' of https://github.com/arventwei/wifiManager

Conflicts:
	Demo/src/com/txmcu/xiaoxin/Udpclient.java
	Demo/src/com/txmcu/xiaoxin/XinStateManager.java