Merge pull request #1329 from ctripcorp/master

merge from master

README.md

@@ -195,3 +195,6 @@ The project is licensed under the [Apache 2 license](https://github.com/ctripcor
 ![猎户星空](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/known-users/ainirobot.png) 
 ![卓健科技](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/known-users/zhuojian.png) 
 ![银江股份](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/known-users/enjoyor.png) 
+![途虎养车](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/known-users/tuhu.png) 
+![河姆渡](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/known-users/homedo.png) 
+![新网银行](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/known-users/xwbank.png) 

apollo-portal/src/main/resources/static/login.html

@@ -244,8 +244,7 @@
                     <div class="row">
                         <div class="col-lg-12">
                             <form id="login-form" action="/signin" method="post" role="form" style="display: block;">
-                                <h2 class="text-center">Apollo配置中心</h2>
-
+                                <p class="text-center"><img src="img/apollo-logo-all.png" style="width: 284px; height:75px; "></p>
                                 <div class="form-group">
                                     <input type="text" name="username" tabindex="1" class="form-control"
                                            placeholder="Username" value="">

apollo-portal/src/main/resources/static/views/common/nav.html

@@ -14,7 +14,7 @@
                  ng-show="viewMode == 2 && showSideBar"
                  ng-click="showSideBar = !showSideBar">
             <a class="navbar-brand logo" href="/">
-                <b>Apollo 配置中心</b>
+                <img src="../../img/logo-simple.png" style="width:131px;height:45px; margin-top: -13px">
             </a>
         </div>
         <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">