msss
444
Merge branch 'master' of https://github.com/icylydia/zhaohua
Merge pull request #30 from ChinaPicture/master

11121
加入画廊和申请参展
Merge branch 'master' of https://github.com/icylydia/zhaohua

Conflicts:
	ArtSearching.xcodeproj/project.pbxproj
all files
add missing .m files link
add .m files
修正艺术家和画廊界面的上拉和下拉刷新
Merge branch 'master' of https://github.com/icylydia/zhaohua