conflictos
doxygen
Merge branch 'arturo2' into BetaRelease

For add Doxygen Messages
Some comments