adding yet another state transition check to avoid cancelation of final units on pilot death
adapt plotting to changed slothistory format
Merge branch 'devel' into feature/ccm
resolve merge conflict from ccm branch