Revert b68bd0d..1faf857

This rolls back to commit b68bd0d11b88d51338e8477ea0cd0bebb171f780.
Merge branch 'zmc' into bug-fixing-branch

This reverts commit 7819384d5125f32e1cdaaa9881ae1f57f79a8e51.

Conflicts:

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