[Lmuse-developer] starting merge

[Florian J. <flo...@we...>]

hi all

please don't commit, i'm merging ;) (everything is stable :) )

greetings
flo