Changes from Simone Pachera integrated, doxygen headers aligned
Authored by: bloehr 2012-11-20
Parent: [r164]
Child: [r166]