changing default namespace of i18n files to 'translations'
Merge remote-tracking branch 'origin/master'