Merge branch 'master' into develop
updated doxygen setup
updated doxygen setup