Merge pull request #587 from franckstauffer/i18n

I18n refactor
Fixed admin locale location