Sync
Merge branch 'master' of https://github.com/stevepetebruce/SchoolBook

Conflicts:

Baker.xcodeproj/project.xcworkspace/xcuserdata/stevenparker.xcuserdatad/
UserInterfaceState.xcuserstate