Merge branch 'master' into 1.x

README.md

@@ -198,3 +198,4 @@ The project is licensed under the [Apache 2 license](https://github.com/ctripcor
 ![途虎养车](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) 
+![中旅安信云贷](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/known-users/ctspcl.png) 

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

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