Merge branch 'develop' into languages/1.3.7-es

# Conflicts:
#	src/router/index.js
#	src/views/ncs-chars/index.vue

src/router/index.js

@@ -224,7 +224,7 @@ export const partRoutes = [
         name: 'user_watch',
         meta: { title: i18n.t('tab.userLocationManage'), icon: 'el-icon-watch', noCache: true }
       }
-    ],
+    ]
   },
   {
     path: '/ncs-sos-device',