Changes from Simen
Merge branch 'master' of https://github.com/mjansrud/Friendly-Sheep.git
Merge branch 'master' of https://github.com/mjansrud/Friendly-Sheep.git
Merge branch 'master' of https://github.com/mjansrud/Friendly-Sheep.git
Merge branch 'master' of https://github.com/mjansrud/Friendly-Sheep.git
Ball