Merge branch 'Emily' into Perfect-master
version som skickats till rolf
tillsnyggo2