Merge branch 'master' into fix/timeline

# Conflicts:
#	CHANGES.md

CHANGES.md

@@ -6,6 +6,7 @@
     * Introduced by 3.5.8
 * Fix: Timeline doesn't work
     * Introduced by 3.5.1
+* Fix: Last Login field does not shown in /admin/user
 * Support: Upgrade libs
     * env-cmd
     * sass-loader

resource/locales/en-US/translation.json

@@ -341,7 +341,7 @@
   "template": {
     "modal_label": {
       "Create/Edit Template Page": "Create/Edit Template Page",
-      "Create template under": "Create template page under: <code>%s</code>"
+      "Create template under": "Create template page under:<br /><code><small>%s</small></code>"
     },
     "option_label": {
       "create/edit": "Create/Edit Template page..",

resource/locales/ja/translation.json

@@ -339,7 +339,7 @@
   "template": {
     "modal_label": {
       "Create/Edit Template Page": "テンプレートページの作成/編集",
-      "Create template under": "<code>%s</code> にテンプレートページを作成"
+      "Create template under": "<code><small>%s</small></code><br />にテンプレートページを作成"
     },
     "option_label": {
       "select": "テンプレートタイプを選択してください",