Merge branch 'docedit' into 'master'

merge new documentation to master

See merge request !48
8 jobs for master in 41 minutes and 33 seconds (queued for 6 seconds)