Merge branch '128_enhancing_tree_obs' into 'master'

At switches now conflicts are only detected if agent has option to choose head on colliding path

Closes #128

See merge request flatland/flatland!129