panewsOK!
没用的
Merge remote-tracking branch 'origin/shabi么么哒' into shabi

Conflicts:
	pa/ThePaApp/AddPictureViewController.m
xixihaha