merge with ipa320
Merge branch 'master' of github.com:accompany-cob3-6/cob_scenario_states into master-accompany-cob3-6