Editing comments - solving conflicts
Merge branch 'multitenant' of https://github.com/couraud/i18n into multitenant
Resolving conflicts