Merge remote-tracking branch 'origin/zmc1216' into 1216

Conflicts:
pa/PaDataManager.m

pa/ThePaApp.xcworkspace/xcuserdata/tao.xcuserdatad/UserInterfaceState.xc
userstate

pa/ThePaApp.xcworkspace/xcuserdata/tao.xcuserdatad/xcdebugger/Breakpoint
s_v2.xcbkptlist
pa/ThePaApp/Constants.h