Merge branch 'dev' of https://github.com/jamoma/JamomaCore into feature/cmake
Merge branch 'feature/cmake' of https://github.com/jamoma/JamomaCore into feature/cmake