f
Merge branch 'master' of https://github.com/sisivip/TimeMachine

Conflicts:
	.settings/org.eclipse.core.resources.prefs
	bin/TimeMachine.apk
	bin/classes/com/timemachine/main/ListMain$NewsAdapter$Holder.class
	bin/classes/com/timemachine/main/ListMain$NewsAdapter.class
	bin/classes/com/timemachine/main/ListMain.class
	bin/classes/com/timemachine/main/PhotographActivity.class
	bin/classes/com/timemachine/main/R$drawable.class
	bin/classes/com/timemachine/main/R$id.class
	bin/classes/com/timemachine/main/R$layout.class
	bin/classes/com/timemachine/main/ScrollLayout.class
	bin/classes/com/timemachine/main/ShowImageActivity.class
	bin/classes/com/timemachine/main/Welcome.class
	bin/classes/com/timemachine/sqlitedb/dbHelper$MyDBHelper.class
	bin/classes/com/timemachine/sqlitedb/dbHelper.class
	bin/classes/com/timemachine/timeshaft/po/Diary.class
	bin/classes/com/timemachine/timeshaft/view/XListView.class
	bin/classes/com/timemachine/timeshaft/view/XListViewFooter.class
	bin/classes/com/timemachine/timeshaft/view/XListViewHeader.class
	gen/com/timemachine/main/R.java
	src/com/timemachine/main/ListMain.java