Merge branch 'master' of gitlab.aicrowd.com:flatland/flatland into 259-reduce-computational-complexity-of-env-step

# Conflicts:
#	flatland/envs/rail_env.py