completed doxygen support
fixed merge conflict in TyphonDoxygen.conf