Fixed merge
Fixed delete btn
Fixed accents français
Merge branch 'master' of https://github.com/sigl-mepa-2015/mepa into jaune_branch
Update from Master