自動連接商家
Merge branch 'master' of https://github.com/KnightSyu/Wifi-Deyrk

Conflicts:
	bin/Circle.apk
	bin/classes.dex
	bin/classes/com/example/Circle/CollectionMain$ListCursorAdapter.class
	bin/classes/com/example/Circle/CollectionMain.class
	bin/classes/com/example/Circle/PushCreateAD$1.class
	bin/classes/com/example/Circle/PushCreateAD$2.class
	bin/resources.ap_