correction erreur texte
correction problemes
Merge branch 'tgm-dev' into merge_upstream_062014