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

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