Merge branch 'develop' into elvan
fixed åäö
Merge branch 'elvan' into develop