[ALOY-967] merge changes done on ALOY-956

[ALOY-967] merge master
Merge pull request #446 from feons/ALOY-967

[ALOY-967] Support i18n directory in widgets