fixed state validation
Merge branch 'bootstrap' of github.com:catarse/catarse into bootstrap