Merge branch 'fix/docs' into 'master'

Fix documentation issues.

This MR just fixes a few minor errors in the doxygen docs and adds an extra pdflatex run to the user guide to ensure references are properly included.

See merge request !749