fix mixin partial merges
Merge branch 'master' of https://github.com/capensis/canopsis-webcore