Merge remote-tracking branch 'origin/dev' into dev

donate-console/src/main/webapp/resources/view/project/project_list.html

@@ -730,7 +730,7 @@
                 <span ng-click="setState('disagreed')">未通过<em>({{numOfUnagreed}})</em></span>
             </div>
             <!--<form class="form-horizontal" method="POST" action="">-->
-            <div class="input-group input-group-sm">
+            <div class="input-group input-group-sm fr">
                 <input id="post-search-input" class="form-control" type="search" ng-model="keyword" ng-search="onSearch()" value="" name="" placeholder="请输入关键词">&nbsp;&nbsp;
                 <input id="search-submit" class="btn btn-default btn-sm" type="submit" value="搜索" ng-click="onSearch()">
             </div>