Merge branch 'master' into stable

diff --cc 2016/index.html
index 1ffe7460b671820494e4fb463bd8c07c2b082c7a,bf1d29eaeaf6bf23f11b9a508c39369efb675871..ad4467882882aa846bb587d5343bda2d982119ff
--- 1/2016/index.html
--- 2/2016/index.html
+++ b/2016/index.html
@@@ -31,19 -31,18 +31,29 @@@
                                <a href="https://my.fsf.org/civicrm/profile/create?gid=326&reset=1">
                                        Apply for an exhibition table</a> for your free software business or project.
                                </p>
 -                      </li>
 +              </li>
 +
 +              <li class="item">
 +                <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/lp_2016_video.png"
 +                     alt="[ Libre Planet: Fork the System Video ]">
 +                <p class="carousel-caption-bottom">
 +                  <a href="http://media.libreplanet.org/u/libreplanet/m/libreplanet-2016-fork-the-system/">
 +                    Libre Planet: Fork the system. </a>
 +
 +                </p>
 +              </li>
 +              
  
+               <li class="item">
+                 <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/lp_2016_video.png"
+                      alt="[ Libre Planet: Fork the System Video ]">
+                 <p class="carousel-caption-bottom">
+                   <a href="http://media.libreplanet.org/u/libreplanet/m/libreplanet-2016-fork-the-system/">
+                     Libre Planet: Fork the system. </a>
+                   
+                 </p>
+               </li>
+               
                                </ul>
  
                                <!-- CAROUSEL FEATURES THAT HAVE BEEN COMMENTED OUT