Editing user manual.
Merge branch 'master' into devel