Merge branch 'master' into feature-search

lib/views/layout/2column.html

@@ -18,13 +18,11 @@
   </button>
   <!-- Collect the nav links, forms, and other content for toggling -->
   <div class="collapse navbar-collapse" id="navbarCollapse">
-    <ul class="nav navbar-nav">
-      <li class=""><a href="/INDEX">INDEX</a></li>
-    </ul>
     <form id="headerSearch" class="navbar-form navbar-left form-inline" role="search" action="/_search">
       <input id="searchQuery" name="q" type="text" class="form-control" placeholder="検索文字...">
       <button type="submit" class="btn btn-default">検索</button>
     </form>
+    {% include '../widget/searcher.html' %}
 
     <ul class="nav navbar-nav navbar-right">