Merge branch 'dev' into merge/api_and_api-cleanup
Merge branch 'merge/api_and_api-cleanup' of github.com:jamoma/JamomaMax into merge/api_and_api-cleanup
Merge branch 'merge/api_and_api-cleanup' of github.com:jamoma/JamomaMax into merge/api_and_api-cleanup
Merge branch 'merge/api_and_api-cleanup' of github.com:jamoma/JamomaMax into merge/api_and_api-cleanup
Merge branch 'merge/api_and_api-cleanup' of github.com:jamoma/JamomaMax into merge/api_and_api-cleanup
Merge branch 'merge/api_and_api-cleanup' of github.com:jamoma/JamomaMax into merge/api_and_api-cleanup
Merge branch 'merge/api_and_api-cleanup' of github.com:jamoma/JamomaMax into merge/api_and_api-cleanup