Merge branch 'master' of github.com:mozilla/bedrock into firefox

apps/b2g/templates/b2g/b2g.html

@@ -74,6 +74,9 @@
     <li><a href="{{ url('b2g.about') }}">About the project</a></li>
     <li><a href="{{ url('b2g.faq') }}">FAQ</a></li>
     <li><a href="http://brendaneich.com/2012/02/mobile-web-api-evolution/">Brendan Eich on the Mobile Web API Evolution</a></li>
+    <li><a href="http://blog.mozilla.com/blog/2012/02/27/mozilla-in-mobile-the-web-is-the-platform/">The Web is the Platform</a></li>
+    <li><a href="http://pressoffice.telefonica.com/jsp/base.jsp?contenido=/jsp/notasdeprensa/notadetalle.jsp&selectNumReg=5&pagina=1&id=66&origen=notapres&idm=eng&pais=1&elem=17874">Telefónica and Mozilla pioneer first Open Web Devices</a></li>
+    <li><a href="http://joshcarpenter.ca/Boot-to-Gecko">Gaia UX Concept for Boot to Gecko</a></li>
   </ul>
 </aside>
 

apps/collusion/templates/collusion/collusion.html

@@ -409,7 +409,7 @@
             <span class="input"><input type="checkbox" name="custom-824" id="privacy-check" value="1" required></span>
 
             <span class="title">
-              I'm okay with you handling this info as your explain in
+              I'm okay with you handling this info as you explain in
               your <a href="{{ php_url('/privacy-policy.html') }}">Privacy
               Policy</a>
             </span>

apps/marketplace/templates/marketplace/marketplace.html

@@ -52,7 +52,7 @@
         controls="controls">
         <source src="//videos-cdn.mozilla.net/serv/flux/apps/marketplace.webm" type="video/webm" />
         <source src="//videos-cdn.mozilla.net/serv/flux/apps/marketplace.theora.ogv" type="video/ogg; codecs=&quot;theora, vorbis&quot;" />
-        <source src="//http://videos-cdn.mozilla.net/serv/flux/apps/marketplace.mp4" type="video/mp4" />
+        <source src="//videos-cdn.mozilla.net/serv/flux/apps/marketplace.mp4" type="video/mp4" />
         <object type="application/x-shockwave-flash"
           style="width: 640px; height: 388px;"
           data="/media/flash/playerWithControls.swf?flv=serv/flux/apps/marketplace.mp4&amp;autoplay=false&amp;msg=Play%20Video">