Dev

Merged Petter Selfors Rølvåg requested to merge dev into master

Merge request reports