Merge branch feature/morten.ofstad/APIDocumentation with refs/heads/master...

Merge branch feature/morten.ofstad/APIDocumentation with refs/heads/master into refs/merge-requests/51/train
3 jobs for !51 with feature/morten.ofstad/APIDocumentation into master in 7 minutes and 59 seconds
merge train