Merge remote-tracking branch 'origin/4.15-candidate' into 4.15-candidate

customize.dist/pages/login.js

@@ -15,7 +15,7 @@ define([
                 h('div.row', [
                     h('div.col-md-3'),
                     h('div#userForm.form-group.hidden.col-md-6', [
-                        h('div.cp-login-instance',Msg.login_instance),
+                        h('div.cp-login-instance', Msg._getKey('login_instance', [ Pages.Instance.name ])),
                         h('input.form-control#name', {
                             name: 'name',
                             type: 'text',

customize.dist/pages/register.js

@@ -56,7 +56,8 @@ define([
                 h('div.cp-reg-form.col-md-6', [
                     h('div#userForm.form-group.hidden', [
                         h('div.cp-register-instance', [
-                            Msg.register_instance, h('br'),
+                            Msg._getKey('register_instance', [ Pages.Instance.name ]),
+                            h('br'),
                             h('a', {
                                 href: '/features.html'
                             }, Msg.register_whyRegister)

customize.dist/src/less2/pages/page-index.less

@@ -30,7 +30,6 @@
 
     .cp-home-hero {
         width: 100%;
-        margin-bottom: 50px;
         align-self: center;
         align-items: center;
     }