2e commit

Signed-off-by: bvalentin <bvalentin@ISDEV11-PC.ihu-strasbourg.eu>
Signed-off-by: unknown <bvalentin@ISDEV11-PC.ihu-strasbourg.eu>
Merge branch 'Dev'