最新的

Conflicts:
pa/PaDataManager.h
pa/PaDataManager.m
pa/ThePaApp.xcodeproj/project.pbxproj

pa/ThePaApp.xcworkspace/xcuserdata/tao.xcuserdatad/UserInterfaceState.xc
userstate
pa/ThePaApp/AppDelegate.m
pa/ThePaApp/JoinPaViewController.m
pa/ThePaApp/LeftMenuViewController.m
pa/ThePaApp/LoginViewController.m
pa/ThePaApp/RightMenuViewController.h
pa/ThePaApp/WallViewController.m