增加"其他"对象
Merge branch 'lyj' of https://github.com/chainton/dankeshare-base.git
into lyj

Conflicts:
	src/com/chainton/dankeshare/wifi/DefaultWifiApManager.java