Fixed merge conflicts

.gitignore

@@ -40,3 +40,4 @@ out/
 *.heapsnapshot
 *.zip
 /common/models/test
+package-lock.json

Gruntfile.js

@@ -52,6 +52,9 @@ module.exports = function GruntConfig(grunt) {
     },
 
     mocha_istanbul: {
+      options: {
+        mochaOptions: ['--exit']
+      },
       coverage: {
         src: 'test/test.js',
         options: {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "oe-skeleton",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "oe-cloud modularization project",
   "engines": {
     "node": ">=6"
@@ -15,8 +15,8 @@
   },
   "dependencies": {
     "camelcase": "5.0.0",
-    "lodash": "4.17.11",
-    "oe-cloud": "2.0.0"
+    "lodash": "4.17.14",
+    "oe-cloud": "^2.0.0"
   },
   "devDependencies": {
     "babel-eslint": "7.2.3",
@@ -25,7 +25,7 @@
     "chai-things": "0.2.0",
     "chalk": "1.1.1",
     "eslint": "4.10.0",
-    "grunt": "1.0.3",
+    "grunt": "1.0.4",
     "grunt-banner": "0.6.0",
     "grunt-cli": "1.3.2",
     "grunt-contrib-clean": "2.0.0",
@@ -39,7 +39,7 @@
     "superagent-defaults": "0.1.14",
     "supertest": "3.4.2",
     "loopback-connector-mongodb": "3.9.2",
-    "oe-connector-postgresql": "2.0.0"
+    "oe-connector-postgresql": "^2.0.0"
   },
   "repository": {
     "type": "git",

test/component-config.json

@@ -1,5 +1,2 @@
 {
-  "loopback-component-explorer": {
-    "mountPath": "/explorer"
-  }
 }