Some minor Doxygen changes
Merge branch 'master' of github.com:jamoma/JamomaCore
Resolving merge conflict