Changes
Merge branch 'master' of https://github.com/per-frojdh/renhallning

Merging stuff, end of day.