Some changes in battle state machine
Merge branch 'master' of https://github.com/infotronik/sumo