1.0003

change

完成了timeline功能的所有触摸事件的处理，使得可以按listView滚动、在viewpager可以单独横向滚动，支持双指增大颗粒度，直接点击图片可以打开图片观察，点击item的其余区域可以展开该item
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/PhotoManager1_0.apk
	bin/classes.dex
	bin/classes/com/example/photomanager1_0/JazzyViewPager.class
	bin/classes/com/example/photomanager1_0/MapActivity$1.class
	bin/classes/com/example/photomanager1_0/MapActivity.class
	bin/classes/com/example/photomanager1_0/MyViewPager.class
	bin/classes/com/example/photomanager1_0/ShowImageActivity.class

	bin/classes/com/example/photomanager1_0/TimelineActivity$MyListView.class

	bin/classes/com/example/photomanager1_0/TimelineActivity$MyViewPagerAdapter.class

	bin/classes/com/example/photomanager1_0/TimelineActivity$PictureAdapter.class
	bin/classes/com/example/photomanager1_0/TimelineActivity.class
	bin/classes/com/example/photomanager1_0/ViewHolder.class
	bin/resources.ap_
	src/com/example/photomanager1_0/MyViewPager.java
	src/com/example/photomanager1_0/TimelineActivity.java
	src/com/example/photomanager1_0/ViewHolder.java