viewpicture只剩那个问题了。尝试了日系风格的图标。
Merge remote-tracking branch 'origin/0120么么哒' into 1223么么哒！

Conflicts:
	pa/ThePaApp/ViewPictureViewController.m
	pa/ThePaApp/WOCollectionViewController.m
merge完毕