Feature/swedish

Rebase on develop