Merge master into 'dev'

diff --cc src/features/mockhsm/routes.js
index d411c90,e1bebac..2ff66b6
--- 1/src/features/mockhsm/routes.js
--- 2/src/features/mockhsm/routes.js
+++ b/src/features/mockhsm/routes.js
@@@ -1,11 -1,4 +1,11 @@@
 -import { List, New, Show } from './components'
 +import { List, New, Show, ResetPassword } from './components'
  import { makeRoutes } from 'features/shared'
  
 -export default (store) => makeRoutes(store, 'key', List, New, Show, { skipFilter: true, name: 'Keys', name_zh:'密钥' })
 +export default (store) => makeRoutes(store, 'key', List, New, Show,
 +  {
 +    childRoutes: [
 +      {
 +        path: ':id/reset-password',
 +        component: ResetPassword,
 +      },
-     ],skipFilter: true, name: 'Keys', name_zh:'密钥' })
++    ],skipFilter: true, name: 'Keys', name_zh:'密钥' })