remove uploads
fix merge
traductions
Merge branch 'dev'