User Manual draft
Merge branch 'develop' into robin