Update the Doxygen main page
Merge branch 'doxygen'
Merge branch 'master' into icon