JOJO收藏區上下頁完成
Merge branch 'master' of https://github.com/KnightSyu/Wifi-Deyrk

Conflicts:
	bin/adhoctry.apk
	bin/classes.dex
	bin/classes/com/example/Circle/CollectionMain.class
	bin/classes/com/example/Circle/DB.class
	bin/classes/com/example/adhoctry/CollectionAD.class
	bin/classes/com/example/adhoctry/CollectionMain$ListCursorAdapter.class
	bin/classes/com/example/adhoctry/ReceiveAD$1.class
	bin/classes/com/example/adhoctry/ReceiveAD$2.class
	bin/classes/com/example/adhoctry/ReceiveAD$3.class
	bin/classes/com/example/adhoctry/ReceiveAD.class
	bin/resources.ap_
	res/layout/fragment_collection_ad.xml
	src/com/example/Circle/CollectionAD.java
	src/com/example/Circle/CollectionMain.java