uniformisation des boutons de new/show/edit pour langue et trads
commit file single checkbox for resolving conflict
Merge branch 'master' of http://github.com/orchestraLight/orchestraLight