implementing parent-conflicts and child-conflicts and detecting them
implementing parent-conflicts and child-conflicts and detecting them


Former-commit-id: 6ba89516b38b7872e2082db2da442ed2d78c8ed4
webgme/webgme-engine,webgme/webgme-engine,webgme/webgme-engine