Ajout des dernières features
Resolve conflicts
Merge commit '0cd41ba'