add database
Merge branch 'master' of github.com:wang850228803/gallery into test

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/Gallery.apk
	bin/classes.dex
	bin/classes/com/example/gallery/ImageAdapter.class
	bin/classes/com/example/gallery/MainActivity$1.class
	bin/classes/com/example/gallery/MainActivity.class
	bin/classes/com/example/gallery/R$anim.class
	bin/classes/com/example/gallery/R$attr.class
	bin/classes/com/example/gallery/R$dimen.class
	bin/classes/com/example/gallery/R$drawable.class
	bin/classes/com/example/gallery/R$id.class
	bin/classes/com/example/gallery/R$layout.class
	bin/classes/com/example/gallery/R$menu.class
	bin/classes/com/example/gallery/R$string.class
	bin/classes/com/example/gallery/R.class
	bin/classes/com/example/gallery/SDlist.class
	bin/classes/com/example/gallery/ShowImageActivity.class
	bin/classes/com/example/gallery/ViewHolder.class
	bin/dexedLibs/android-support-v4-e3d007f2e41b2bb906b42cb00692a78d.jar
	bin/resources.ap_
	gen/com/example/gallery/R.java
	res/menu/main.xml
	src/com/example/gallery/ImageAdapter.java
	src/com/example/gallery/MainActivity.java