Merge branch 'master' of https://github.com/zjn0505/UIWidgetTest.git

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/UIWidgetTest.apk
	bin/classes.dex
	bin/resources.ap_
	res/drawable-hdpi/custom_button_background.xml
	res/layout/activity_main.xml
	res/layout/image_view.xml
	src/com/example/uitest/ImageViewActivity.java
	src/com/example/uitest/MainActivity.java