Merge branch 'feature-aibt'

Conflicts:

proj.ios/halloween.xcodeproj/project.xcworkspace/xcuserdata/neonaleon.xc
userdatad/UserInterfaceState.xcuserstate