fixing this one
Merge branch 'master' of https://github.com/jamoma/JamomaMax
Merge branch 'master' into dev