ajout de scout
Merge branch 'dev' into hotfix-chanel-no5

Conflicts:
	src/Controller.py