resolve ghit problems
Merge branch 'Devlopment' of https://github.com/Farconer/LESEINE_Julien_MASLAK_Franck_3IDJV_Rush_to_the_castle into Devlopment