Merge branch 'master' into mass-vore

satiate.html

@@ -54,7 +54,7 @@
         </div>
         <div id="log">
         </div>
-        <div class="sidebar" id="area-info">
+        <div class="sidebar">
           <div id="area-name"></div>
           <div id="area-desc"></div>
           <div id="area-info">