Revert "Revert "Feature/multilingual phase iii - Test Merge""
Merge pull request #9 from DosMaster/revert-7-revert-1-feature/multilingual-phase-iii

Revert "Revert "Feature/multilingual phase iii - Test Merge""