Modification mineures d'interface
probleme de merge
Merge origin/Trunk into Trunk
Legers fix aux tests