Fixed issue with i18n not loading the correct language

Added unittests for i18n
Merge remote-tracking branch 'origin/master'