Merge branch 'master' into 5211-improved-top-navbar

diff --cc doc/_includes/_navbar_top.liquid
index 9ac810140b8e925f26afce6851dafe74b28c2d9d,0d8aaea83cc49df2306a527ba4b86632a61a7515..3e23e6d4e84d543e331964c43263bc3dc966e2ea
--- 1/doc/_includes/_navbar_top.liquid
--- 2/doc/_includes/_navbar_top.liquid
+++ b/doc/_includes/_navbar_top.liquid
@@@ -13,11 -13,24 +13,23 @@@
        <ul class="nav navbar-nav">
          <li {% if page.navsection == 'start' %} class="active" {% endif %}><a href="{{ site.baseurl }}/start/index.html">Getting&nbsp;Started</a></li>
          <li {% if page.navsection == 'userguide' %} class="active" {% endif %}><a href="{{ site.baseurl }}/user/index.html">User&nbsp;Guide</a></li>
 -        <li {% if page.navsection == 'sdk' %} class="active" {% endif %}><a href="{{ site.baseurl }}/sdk/index.html">SDK&nbsp;Reference</a></li>
 -        <li {% if page.navsection == 'api' %} class="active" {% endif %}><a href="{{ site.baseurl }}/api/index.html">API&nbsp;Reference</a></li>
 -        <li {% if page.navsection == 'adminguide' %} class="active" {% endif %}><a href="{{ site.baseurl }}/admin/index.html">Admin Guide</a></li>
 -        <li {% if page.navsection == 'installguide' %} class="active" {% endif %}><a href="{{ site.baseurl }}/install/index.html">Install Guide</a></li>
 +        <li {% if page.navsection == 'sdk' %} class="active" {% endif %}><a href="{{ site.baseurl }}/sdk/index.html">SDKs</a></li>
 +        <li {% if page.navsection == 'api' %} class="active" {% endif %}><a href="{{ site.baseurl }}/api/index.html">API</a></li>
 +        <li {% if page.navsection == 'installguide' %} class="active" {% endif %}><a href="{{ site.baseurl }}/install/index.html">Install</a></li>
          <li><a href="https://arvados.org/projects/arvados/" style="padding-left: 2em">Developer Site&nbsp;&raquo;</a></li>
        </ul>
+ 
+       <div class="pull-right" style="padding-top: 6px">
+         <form method="get" action="http://www.google.com/search">
+           <div class="input-group" style="width: 220px">
+             <input type="text" class="form-control" name="q" placeholder="search">
+             <div class="input-group-addon">
+               <button class="glyphicon glyphicon-search" style="border: 0px" type="submit"></button>
+             </div>
+             <input type="hidden" name="sitesearch" value="doc.arvados.org"/>
+           </div>
+         </form>
+       </div>
      </div>
    </div>
  </div>