Correct Doxyfile
Merge branch 'doxygen'
Merge branch 'master' into weblink