some random commits
Merge branch '1216' into 1223么么哒！

Conflicts:
	pa/ThePaApp/Base.lproj/Main_iPhone.storyboard
mergef