Story 13, acceptanstest engelska ->svenska
Fix mergeconflicts
Merge branch 'master' of github.com:buren/enduro into Story13
Merge pull request #99 from buren/Story13

Story13