fix
Merge branch 'master' of https://github.com/MCTeam/MCT-MCGame

Conflicts:

MCGame.xcodeproj/project.xcworkspace/xcuserdata/kwanterry.xcuserdatad/Us
erInterfaceState.xcuserstate