Merge branch 'vadereManager' into 'master'

Vadere manager

See merge request !79
10 jobs for master in 138 minutes and 39 seconds (queued for 1 second)