bugfix in UI state machine
Merge branch 'master' of https://github.com/peyremorgan/thex