画廊详细信息
Merge branch 'master' of https://github.com/icylydia/zhaohua

Conflicts:
	ArtSearching.xcodeproj/project.pbxproj
123