Merge pull request #23 from malmuki/Francois

Francois
Merge branch 'dev' of https://github.com/malmuki/Tp3-RTS-A14.git into dev
plus de change
Merge branch 'dev' of local repository into Francois