fz change
Merge remote-tracking branch 'origin/liu' into liu

Conflicts:
	museum/src/cn/nwpu/museum/activity/DescriptionActivity.java