版本修正
Merge branch 'master' of https://github.com/KnightSyu/Wifi-Deyrk

Conflicts:
	bin/adhoctry.apk
Merge branch 'master' of https://github.com/KnightSyu/Wifi-Deyrk
版本合併
測試合併
Merge branch 'master' of https://github.com/KnightSyu/Wifi-Deyrk

Conflicts:
	bin/adhoctry.apk
	bin/classes.dex
	bin/classes/com/example/adhoctry/CollectionMain.class
	bin/classes/com/example/adhoctry/PushCreateAD$1.class
	bin/classes/com/example/adhoctry/PushCreateAD$2.class
	bin/classes/com/example/adhoctry/PushCreateAD.class
	bin/classes/com/example/adhoctry/PushMain$1.class
	bin/classes/com/example/adhoctry/PushMain$ListCursorAdapter.class
	bin/classes/com/example/adhoctry/PushMain.class
	bin/classes/com/example/adhoctry/ReceiveMain$ListCursorAdapter.class
	bin/classes/com/example/adhoctry/ReceiveMain.class
	bin/resources.ap_
新增icon、更改專案名稱為Circle
Merge branch 'master' of https://github.com/KnightSyu/Wifi-Deyrk

Conflicts:
	bin/classes/com/example/Circle/FilesMain$1.class
	bin/classes/com/example/Circle/PushCreateAD$1.class