Preparation du merge
Merge branch 'master' of https://github.com/FrancoisThomas/PrOOjet
Fin du merge et ecran lancement+ressources