Develop

Espen Stranger Selandrequested to merge
develop into master

Tester litt her før trafikken blir for stor.

Merge request reports