#162 src/common/core/core.js conflict resolution.
#162 src/common/core/core.js conflict resolution.


Former-commit-id: b8f9076b6176e21932051fd012857080b157a8bb
webgme/webgme-engine,webgme/webgme-engine,webgme/webgme-engine