Dev

Fredrik Bagge Carlsonrequested to merge
dev into master

Add lots of new functionality

Merge request reports