抓
連線功能
Merge branch 'master' of https://github.com/KnightSyu/Wifi-Deyrk

Conflicts:
	bin/adhoctry.apk
	bin/classes.dex
	bin/classes/com/example/adhoctry/CollectionMain$ListCursorAdapter.class
	bin/classes/com/example/adhoctry/CollectionMain.class
	bin/classes/com/example/adhoctry/CollectionRoot.class
	bin/classes/com/example/adhoctry/FilesMain$2.class
	bin/classes/com/example/adhoctry/FilesMain.class
	bin/classes/com/example/adhoctry/FilesRoot.class
	bin/classes/com/example/adhoctry/PushCreateAD$1.class
	bin/classes/com/example/adhoctry/PushCreateAD$2.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/PushRoot.class
	bin/classes/com/example/adhoctry/R$id.class
	bin/classes/com/example/adhoctry/R$layout.class
	bin/classes/com/example/adhoctry/R$menu.class
	bin/classes/com/example/adhoctry/R$string.class
	bin/classes/com/example/adhoctry/R$style.class
	bin/classes/com/example/adhoctry/ReceiveMain$ListCursorAdapter.class
	bin/classes/com/example/adhoctry/ReceiveMain.class
	bin/classes/com/example/adhoctry/ReceiveRoot.class
	bin/classes/com/example/adhoctry/SetRoot.class
	gen/com/example/adhoctry/R.java
	src/com/example/adhoctry/FilesMain.java
0930版本(尚未可以傳輸資料)