Fix situation rendering and player bindings
Merge branch 'master' of github.com:skattyadz/cabinet