fix merge conflicts
Merge branch 'master' of https://github.com/x3dom/apps-modeling