solve conflits
gestion des typemime
gestion des typemime
Merge branch 'master' of https://github.com/shrowdes/commanche