sync
Merge branch 'dev' of https://github.com/jamoma/Jamoma into dev
sync