Merge branch 'develop' of git://github.com/Pita/etherpad-lite into body-block

Conflicts:
	src/templates/pad.html

src/templates/admin/plugins.html

@@ -20,7 +20,7 @@
 
 
       <h1>Etherpad Lite</h1>
-      <div class="seperator"></div>
+      <div class="separator"></div>
       <h2>Installed plugins</h2>
       <table>
         <thead>
@@ -44,7 +44,7 @@
       </table>
 
       <div class="paged listing search-results">
-        <div class="seperator"></div>
+        <div class="separator"></div>
         <h2>Search for plugins to install</h2>
         <form>
           <input type="text" name="search" placeholder="Search term" id="search-query">

src/templates/pad.html

@@ -201,12 +201,6 @@
                 <h2>Embed URL</h2>
                 <input id="embedinput" type="text" value="">
             </div>
-            <br>
-            <div id="qrcode">
-                <h2>QR code</h2>
-                <div id="qr_center"><img id="embedreadonlyqr"></div>
-            </div>
-            <% e.end_block(); %>
         </div>
 
         <div id="chatthrob"></div>