fixed conflict between Annotator and internationalitation
Merge pull request #2493 from danielcebrian/daniel-branch-fix

fixed conflict between Annotator and internationalitation