Playing with gamelogic FSM
Merge branch 'master' into develop