descriptionActivity
Merge branch 'liu' of https://github.com/flickerchou/Museum.git into liu

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