jar包导入顺序
server自动连接到wifi的修改
Merge branch 'chenyan'

Conflicts:
	.classpath