More work on sidebar to deal with accidental overwrite.

diff --cc server/2016/sidebar.html
index c028e13a7baf1dd72d005bfd335ba10979b1f293,95d61f0b0309d9f052e419cbf4dca872d30c231d..9b5cc1e4ed03c8e857b35df05f6f3d17f7ef5205
--- 1/server/2016/sidebar.html
--- 2/server/2016/sidebar.html
+++ b/server/2016/sidebar.html
@@@ -1,61 -1,72 +1,60 @@@
 -      <div class="container"> <!-- start of container -->
 -  <div class="row">
 -    <div id="lp-nav" class="col-sm-3"> <!-- start of sidebar column -->
 -      <!--#if expr='"$REQUEST_URI" != "/2016/"' -->
 -      <p class="text-center lp-home">
 -        <a class="text-muted" href="/2016/">
 -          <span class="glyphicon glyphicon-chevron-left"></span> Home
 -        </a>
 -      </p>
 -      <!--#endif -->
 -
 -      <!-- Sidebar items that are commented out
 -
 -      <li id="cfs-link"><a href="/2016/call_for_sessions">Propose a Session</a></li>
 -
 -      <li><a href="/2016/program/exhibit_hall.html">Exhibit hall</a></li>
 -
 -      <li id="scholarship-link"><a href="/2016/scholarships">Apply for a Scholarship</a></li>
 -
 -      <li><a href="/2016/scholarships">Scholarships (until January 10th)</a></li>
 -
 +<div class="container"> <!-- start of container -->
-   <div class="row">
-     <div id="lp-nav" class="col-sm-3"> <!-- start of sidebar column -->
-       <!--#if expr='"$REQUEST_URI" != "/2016/"' -->
-       <p class="text-center lp-home">
-         <a class="text-muted" href="/2016/">
-           <span class="glyphicon glyphicon-chevron-left"></span> Home
-         </a>
-       </p>
-       <!--#endif -->
++      <div class="row">
++              <div id="lp-nav" class="col-sm-3"> <!-- start of sidebar column -->
++                      <!--#if expr='"$REQUEST_URI" != "/2016/"' -->
++                      <p class="text-center lp-home">
++                              <a class="text-muted" href="/2016/">
++                                      <span class="glyphicon glyphicon-chevron-left"></span> Home
++                              </a>
++                      </p>
++                      <!--#endif -->
 +
++                      <!-- Sidebar items that are commented out
++                      <li><a href="/2016/program/exhibit_hall.html">Exhibit hall</a></li>
++                      <li id="scholarship-link"><a href="/2016/scholarships">Apply for a Scholarship</a></li>
+                       <li id="volunteer-link"><a href="/2016/volunteer">Volunteer</a></li>
 -
 -      <li><a href="https://libreplanet.org/wiki/LibrePlanet:Conference/2016/Conference_brainstorm">Share Your Conference Ideas</a></li>
 -
 -      <li><a href="http://media.libreplanet.org/">Videos of previous conferences</a></li>
 -
 -      <li><a href="/2014/program/sessions.html">Last Year's Program</a></li>
 -    -->
 -
 -    <ul class="nav nav-pills nav-stacked" style="padding-top: 0 !important;">
 -
 -                      <!--<li><a href="/2016/live">Livestream & Chat</a></li>-->
 -      <li><a href="/2016/program">Program</a></li>
 -      <li><a href="/2016/program/social.html">Social Events</a></li>
 -      <li id="exhibit-link"><a href="/2016/program/exhibit-hall.html">Exhibit Hall</a></li>
 -      <li><a href="/2016/sponsors">Sponsors</a></li>
 -    </ul>
 -
 -    <ul class="nav nav-pills nav-stacked">
 -      <li id="mailing-list-link"><a href="https://lists.gnu.org/mailman/listinfo/libreplanet-discuss">Join the Discussion List</a></li>
 -      <li id="getting_around-link"><a href="/2016/getting_around">Travel Info</a></li>
 -
 -
 -      <li><a href="/2016/scholarship_donation">Build the Scholarship Fund</a></li>
 -
 -      <li id="ahp-link"><a href="/2016/anti-harassment/">Anti-Harassment Policy</a></li>
 -
 -    </ul>
 -
 -    <ul class="nav nav-pills nav-stacked">
 -      <li class="fsf-donate">
 -        <a href="https://my.fsf.org/associate/support_freedom">
 -          <span class="glyphicon glyphicon-heart"></span>
 -          Become a proud FSF Member
 -        </a>
 -      </li>
 -    </ul>
 -    <p class="text-muted text-center">and attend the conference gratis!</p>
 -
 -
 -    <ul  class="list-group margin-top">
 -      <li class="list-group-item">
 -        <strong>Recent Updates</strong>
 -      </li>
++                      <li><a href="https://libreplanet.org/wiki/LibrePlanet:Conference/2016/Conference_brainstorm">Share Your Conference Ideas</a></li>
++                      <li><a href="/2016/live">Livestream & Chat</a></li>
++                      <li><a href="/2016/program">Program</a></li>
++                      <li><a href="/2016/program/social.html">Social Events</a></li>
++                      <li id="exhibit-link"><a href="/2016/program/exhibit-hall.html">Exhibit Hall</a></li>
++                      <li><a href="/2016/sponsors">Sponsors</a></li>
++              -->
 +
-       <!--<ul class="nav nav-pills nav-stacked">
-         <li><a href="https://www.fsf.org/blogs/community/what-do-you-have-to-say-share-it-at-libreplanet-2016">Call for Proposals (until 11/16)</a></li>
-         <li><a href="/2016/program">Program</a></li>
-         <li><a href="#">Social Events</a></li>
-         <li id="exhibit-link">
-           <a href="#">Exhibit Hall</a>
-         </li>
-         <li><a href="#">Sponsors</a></li>
-       </ul>-->
++              <ul class="nav nav-pills nav-stacked">
++                      <li id="cfs-link"><a href="https://my.fsf.org/civicrm/profile/create?gid=325&reset=1">Propose a Session</a></li>
++                      <li><a href="https://media.libreplanet.org/">Videos of previous conferences</a></li>
++                      <li><a href="https://www.libreplanet.org/2015/program">Last year's program</a></li>
++              </ul>
 +
-       <ul class="nav nav-pills nav-stacked">
-         <li id="mailing-list-link">
-           <a href="https://lists.gnu.org/mailman/listinfo/libreplanet-discuss">
-             Join the Discussion List</a>
-         </li>
-         <li id="getting-around_link">
-           <a href="/2016/getting_around">Travel Info</a>
-         </li>
-         <li><a href="https://libreplanet.org/2015/scholarship_donation">Build the Scholarship Fund</a></li>
-         <li id="ahp-link"><a href="#">Safe space policy</a>
-         </li>
-       </ul>
++              <ul class="nav nav-pills nav-stacked">
++                      <li id="mailing-list-link"><a href="https://lists.gnu.org/mailman/listinfo/libreplanet-discuss">Join the discussion list</a></li>
++                      <li id="getting_around-link"><a href="/2016/getting_around">Travel info</a></li>
++                      <li><a href="https://libreplanet.org/2015/scholarship_donation">Build the scholarship fund</a></li>
++                      <li id="ahp-link"><a href="/2016/anti-harassment/">Safe space policy</a></li>
++              </ul>
 +
-       <ul class="nav nav-pills nav-stacked">
-         <li class="fsf-donate">
-           <a href="https://my.fsf.org/associate/support_freedom">
-             <span class="glyphicon glyphicon-heart"></span>
-             Become a proud FSF Member
-           </a>
-         </li>
-       </ul>
-       <p class="text-muted text-center">
-         and attend the conference gratis!</p>
++              <ul class="nav nav-pills nav-stacked">
++                      <li class="fsf-donate">
++                              <a href="https://my.fsf.org/associate/support_freedom">
++                                      <span class="glyphicon glyphicon-heart"></span>
++                                      Become a proud FSF Member
++                              </a>
++                      </li>
++              </ul>
++              <p class="text-muted text-center">and attend the conference gratis!</p>
 +
-       <ul  class="list-group margin-top">
-         <li class="list-group-item">
-           <strong>Recent Updates</strong>
-         </li>
-       <li class="list-group-item">
-       <strong>10/02/2015:</strong> <a href="https://www.fsf.org/blogs/community/what-do-you-have-to-say-share-it-at-libreplanet-2016">
-             2016 Call for Proposals open until November 16th</a>
-           </li>
-           <li class="list-group-item">
-                 <strong>03/23/2015:</strong> <a href="https://www.fsf.org/blogs/community/libreplanet-2015-highlights-and-what-comes-next">
-             LibrePlanet 2015: Highlights and what comes next</a>
-         </li>
-       </ul>
-     </div> <!-- end of sidebar column -->
-     <div id="lp-content" class="col-sm-9"> <!-- start of content column -->
++              <ul  class="list-group margin-top">
++                      <li class="list-group-item">
++                              <strong>Recent Updates</strong>
++                      </li>
+                       <li class="list-group-item">
 -                              <strong>03/23/2016:</strong> <a href="https://www.fsf.org/blogs/community/libreplanet-2015-highlights-and-what-comes-next">LibrePlanet 2016: Highlights and what comes next</a></li>
 -      <li class="list-group-item">
 -        <strong>03/21/2016:</strong> <a href="https://www.fsf.org/news/free-software-award-winners">Sébastien Jodogne, ReGlue are Free Software Award winners</a></li>
 -        </ul>
 -      </div> <!-- end of sidebar column -->
 -      <div id="lp-content" class="col-sm-9"> <!-- start of content column -->
++                              <strong>10/02/2015:</strong> <a href="https://www.fsf.org/blogs/community/what-do-you-have-to-say-share-it-at-libreplanet-2016">LibrePlanet 2016 call for proposals is open until November 16th</a></li>
++                              <li class="list-group-item">
++                                      <strong>09/10/2015:</strong> <a href="https://www.fsf.org/blogs/community/who-is-improving-the-world-through-free-software-nominate-them-now">Nominate your heroes for a free software award!</a></li>
++                              <li class="list-group-item">
++                                      <strong>03/23/2015:</strong> <a href="https://www.fsf.org/blogs/community/libreplanet-2015-highlights-and-what-comes-next">LibrePlanet 2016: Highlights and what comes next</a></li>
++
++                                      </ul>
++                              </div> <!-- end of sidebar column -->
++                              <div id="lp-content" class="col-sm-9"> <!-- start of content column -->