merge 非完美版

Conflicts:
pa/PaDataManager.h
pa/PaDataManager.m
pa/ReplyYdhViewController.m
pa/RightMenuViewController.m

pa/ThePaApp.xcworkspace/xcuserdata/admin.xcuserdatad/UserInterfaceState.
xcuserstate

pa/ThePaApp.xcworkspace/xcuserdata/admin.xcuserdatad/xcdebugger/Breakpoi
nts_v2.xcbkptlist
pa/ThePaApp/Constants.h
pa/ThePaApp/PaWallObject.h
pa/ThePaApp/PaWallObject.m
pa/ThePaApp/YdhButton.h
pa/ThePaApp/YdhButton.m
pa/ThePaApp/YdhRequest.h
pa/ThePaApp/YdhRequest.m
pa/YdhViewController.m