libra syu
Merge branch 'master' of https://github.com/KnightSyu/Wifi-Deyrk

Conflicts:
	bin/adhoctry.apk
	bin/classes.dex
	bin/classes/com/example/adhoctry/PushCreateAD$1.class
	bin/classes/com/example/adhoctry/PushCreateAD.class
	bin/resources.ap_
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_
	src/com/example/adhoctry/PushMain.java
	src/com/example/adhoctry/ReceiveMain.java
在上傳