xx
Merge branch '1223么么哒！' into 112么么哒！
view picture 差不多了
viewpicturevc差不多了and可以用自己图了
Merge remote-tracking branch 'origin/112么么哒！' into 1223么么哒！

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