diff --git a/public/cache.manifest b/public/cache.manifest
index 6a2be972..4f7362db 100644
--- a/public/cache.manifest
+++ b/public/cache.manifest
@@ -1,5 +1,9 @@
 CACHE MANIFEST
-#Date Thu Dec 05 2013 00:25:46
+<<<<<<< HEAD
+#Date Thu Dec 05 2013 00:36:35
+=======
+#Date Tue Dec 03 2013 00:27:53
+>>>>>>> dd07077616dde78c6dc19f22e39ea98f05575656
 
 CACHE:
 res/worker.js
diff --git a/public/res-min/main.js b/public/res-min/main.js
index 85738425..ee6124da 100644
--- a/public/res-min/main.js
+++ b/public/res-min/main.js
@@ -20493,8 +20493,8 @@ function() {
  }, r.onReady = function() {
   i = e(document.body), o = e('<div class="hide">'), e(".working-indicator").append(o);
   for (var t = 0; 3 > t; t++) o.append(e('<div class="bar">').css({
-   "animation-delay": (15 * t / 100).toPrecision(3) + "s",
-   "-webkit-animation-delay": (15 * t / 100).toPrecision(3) + "s"
+   "animation-delay": (2 * t / 10).toPrecision(3) + "s",
+   "-webkit-animation-delay": (2 * t / 10).toPrecision(3) + "s"
   }));
  }, r;
 }), function(e) {
diff --git a/public/res-min/themes/base.css b/public/res-min/themes/base.css
index d2514b2b..5d0a938c 100644
--- a/public/res-min/themes/base.css
+++ b/public/res-min/themes/base.css
@@ -1167,7 +1167,7 @@ pre .coffeescript .javascript,pre .javascript .xml,pre .tex .formula,pre .xml .j
 .icon-code:before{content:'\e844'}
 .icon-folder-open:before{content:'\e81e'}
 .icon-left-big:before{content:'\e88a'}
-@font-face{font-family:'Open Sans';font-style:normal;font-weight:300;src:url("../font/OpenSans-Light.woff") format('woff')}@font-face{font-family:'Open Sans';font-style:normal;font-weight:400;src:url("../font/OpenSans.woff") format('woff')}@font-face{font-family:'Open Sans';font-style:normal;font-weight:700;src:url("../font/OpenSans-Bold.woff") format('woff')}@font-face{font-family:'Open Sans';font-style:italic;font-weight:300;src:url("../font/OpenSansLight-Italic.woff") format('woff')}@font-face{font-family:'Open Sans';font-style:italic;font-weight:400;src:url("../font/OpenSans-Italic.woff") format('woff')}@font-face{font-family:'Open Sans';font-style:italic;font-weight:700;src:url("../font/OpenSans-BoldItalic.woff") format('woff')}.container{margin-bottom:100px}
+@font-face{font-family:'Open Sans';font-style:normal;font-weight:300;src:url("../font/OpenSans-Light.woff") format('woff')}@font-face{font-family:'Open Sans';font-style:normal;font-weight:400;src:url("../font/OpenSans.woff") format('woff')}@font-face{font-family:'Open Sans';font-style:normal;font-weight:700;src:url("../font/OpenSans-Bold.woff") format('woff')}@font-face{font-family:'Open Sans';font-style:italic;font-weight:300;src:url("../font/OpenSansLight-Italic.woff") format('woff')}@font-face{font-family:'Open Sans';font-style:italic;font-weight:400;src:url("../font/OpenSans-Italic.woff") format('woff')}@font-face{font-family:'Open Sans';font-style:italic;font-weight:700;src:url("../font/OpenSans-BoldItalic.woff") format('woff')}.container{margin-bottom:180px}
 a code{color:inherit}
 h1{font-size:36px}
 h2{font-size:30px}
diff --git a/public/res-min/themes/default.css b/public/res-min/themes/default.css
index a1a927fb..8efd2ec8 100644
--- a/public/res-min/themes/default.css
+++ b/public/res-min/themes/default.css
@@ -1182,7 +1182,7 @@ pre .coffeescript .javascript,pre .javascript .xml,pre .tex .formula,pre .xml .j
 .icon-code:before{content:'\e844'}
 .icon-folder-open:before{content:'\e81e'}
 .icon-left-big:before{content:'\e88a'}
-@font-face{font-family:'Open Sans';font-style:normal;font-weight:300;src:url("../font/OpenSans-Light.woff") format('woff')}@font-face{font-family:'Open Sans';font-style:normal;font-weight:400;src:url("../font/OpenSans.woff") format('woff')}@font-face{font-family:'Open Sans';font-style:normal;font-weight:700;src:url("../font/OpenSans-Bold.woff") format('woff')}@font-face{font-family:'Open Sans';font-style:italic;font-weight:300;src:url("../font/OpenSansLight-Italic.woff") format('woff')}@font-face{font-family:'Open Sans';font-style:italic;font-weight:400;src:url("../font/OpenSans-Italic.woff") format('woff')}@font-face{font-family:'Open Sans';font-style:italic;font-weight:700;src:url("../font/OpenSans-BoldItalic.woff") format('woff')}.container{margin-bottom:100px}
+@font-face{font-family:'Open Sans';font-style:normal;font-weight:300;src:url("../font/OpenSans-Light.woff") format('woff')}@font-face{font-family:'Open Sans';font-style:normal;font-weight:400;src:url("../font/OpenSans.woff") format('woff')}@font-face{font-family:'Open Sans';font-style:normal;font-weight:700;src:url("../font/OpenSans-Bold.woff") format('woff')}@font-face{font-family:'Open Sans';font-style:italic;font-weight:300;src:url("../font/OpenSansLight-Italic.woff") format('woff')}@font-face{font-family:'Open Sans';font-style:italic;font-weight:400;src:url("../font/OpenSans-Italic.woff") format('woff')}@font-face{font-family:'Open Sans';font-style:italic;font-weight:700;src:url("../font/OpenSans-BoldItalic.woff") format('woff')}.container{margin-bottom:180px}
 a code{color:inherit}
 h1{font-size:36px}
 h2{font-size:30px}
diff --git a/public/res-min/themes/gray.css b/public/res-min/themes/gray.css
index fecc7eea..6809a312 100644
--- a/public/res-min/themes/gray.css
+++ b/public/res-min/themes/gray.css
@@ -1182,7 +1182,7 @@ pre .coffeescript .javascript,pre .javascript .xml,pre .tex .formula,pre .xml .j
 .icon-code:before{content:'\e844'}
 .icon-folder-open:before{content:'\e81e'}
 .icon-left-big:before{content:'\e88a'}
-@font-face{font-family:'Open Sans';font-style:normal;font-weight:300;src:url("../font/OpenSans-Light.woff") format('woff')}@font-face{font-family:'Open Sans';font-style:normal;font-weight:400;src:url("../font/OpenSans.woff") format('woff')}@font-face{font-family:'Open Sans';font-style:normal;font-weight:700;src:url("../font/OpenSans-Bold.woff") format('woff')}@font-face{font-family:'Open Sans';font-style:italic;font-weight:300;src:url("../font/OpenSansLight-Italic.woff") format('woff')}@font-face{font-family:'Open Sans';font-style:italic;font-weight:400;src:url("../font/OpenSans-Italic.woff") format('woff')}@font-face{font-family:'Open Sans';font-style:italic;font-weight:700;src:url("../font/OpenSans-BoldItalic.woff") format('woff')}.container{margin-bottom:100px}
+@font-face{font-family:'Open Sans';font-style:normal;font-weight:300;src:url("../font/OpenSans-Light.woff") format('woff')}@font-face{font-family:'Open Sans';font-style:normal;font-weight:400;src:url("../font/OpenSans.woff") format('woff')}@font-face{font-family:'Open Sans';font-style:normal;font-weight:700;src:url("../font/OpenSans-Bold.woff") format('woff')}@font-face{font-family:'Open Sans';font-style:italic;font-weight:300;src:url("../font/OpenSansLight-Italic.woff") format('woff')}@font-face{font-family:'Open Sans';font-style:italic;font-weight:400;src:url("../font/OpenSans-Italic.woff") format('woff')}@font-face{font-family:'Open Sans';font-style:italic;font-weight:700;src:url("../font/OpenSans-BoldItalic.woff") format('woff')}.container{margin-bottom:180px}
 a code{color:inherit}
 h1{font-size:36px}
 h2{font-size:30px}
diff --git a/public/res-min/themes/night.css b/public/res-min/themes/night.css
index ae14dbea..3fab843c 100644
--- a/public/res-min/themes/night.css
+++ b/public/res-min/themes/night.css
@@ -1182,7 +1182,7 @@ pre .coffeescript .javascript,pre .javascript .xml,pre .tex .formula,pre .xml .j
 .icon-code:before{content:'\e844'}
 .icon-folder-open:before{content:'\e81e'}
 .icon-left-big:before{content:'\e88a'}
-@font-face{font-family:'Open Sans';font-style:normal;font-weight:300;src:url("../font/OpenSans-Light.woff") format('woff')}@font-face{font-family:'Open Sans';font-style:normal;font-weight:400;src:url("../font/OpenSans.woff") format('woff')}@font-face{font-family:'Open Sans';font-style:normal;font-weight:700;src:url("../font/OpenSans-Bold.woff") format('woff')}@font-face{font-family:'Open Sans';font-style:italic;font-weight:300;src:url("../font/OpenSansLight-Italic.woff") format('woff')}@font-face{font-family:'Open Sans';font-style:italic;font-weight:400;src:url("../font/OpenSans-Italic.woff") format('woff')}@font-face{font-family:'Open Sans';font-style:italic;font-weight:700;src:url("../font/OpenSans-BoldItalic.woff") format('woff')}.container{margin-bottom:100px}
+@font-face{font-family:'Open Sans';font-style:normal;font-weight:300;src:url("../font/OpenSans-Light.woff") format('woff')}@font-face{font-family:'Open Sans';font-style:normal;font-weight:400;src:url("../font/OpenSans.woff") format('woff')}@font-face{font-family:'Open Sans';font-style:normal;font-weight:700;src:url("../font/OpenSans-Bold.woff") format('woff')}@font-face{font-family:'Open Sans';font-style:italic;font-weight:300;src:url("../font/OpenSansLight-Italic.woff") format('woff')}@font-face{font-family:'Open Sans';font-style:italic;font-weight:400;src:url("../font/OpenSans-Italic.woff") format('woff')}@font-face{font-family:'Open Sans';font-style:italic;font-weight:700;src:url("../font/OpenSans-BoldItalic.woff") format('woff')}.container{margin-bottom:180px}
 a code{color:inherit}
 h1{font-size:36px}
 h2{font-size:30px}
diff --git a/public/res-min/themes/school.css b/public/res-min/themes/school.css
index 472724d7..1928a391 100644
--- a/public/res-min/themes/school.css
+++ b/public/res-min/themes/school.css
@@ -1182,7 +1182,7 @@ pre .coffeescript .javascript,pre .javascript .xml,pre .tex .formula,pre .xml .j
 .icon-code:before{content:'\e844'}
 .icon-folder-open:before{content:'\e81e'}
 .icon-left-big:before{content:'\e88a'}
-@font-face{font-family:'Open Sans';font-style:normal;font-weight:300;src:url("../font/OpenSans-Light.woff") format('woff')}@font-face{font-family:'Open Sans';font-style:normal;font-weight:400;src:url("../font/OpenSans.woff") format('woff')}@font-face{font-family:'Open Sans';font-style:normal;font-weight:700;src:url("../font/OpenSans-Bold.woff") format('woff')}@font-face{font-family:'Open Sans';font-style:italic;font-weight:300;src:url("../font/OpenSansLight-Italic.woff") format('woff')}@font-face{font-family:'Open Sans';font-style:italic;font-weight:400;src:url("../font/OpenSans-Italic.woff") format('woff')}@font-face{font-family:'Open Sans';font-style:italic;font-weight:700;src:url("../font/OpenSans-BoldItalic.woff") format('woff')}.container{margin-bottom:100px}
+@font-face{font-family:'Open Sans';font-style:normal;font-weight:300;src:url("../font/OpenSans-Light.woff") format('woff')}@font-face{font-family:'Open Sans';font-style:normal;font-weight:400;src:url("../font/OpenSans.woff") format('woff')}@font-face{font-family:'Open Sans';font-style:normal;font-weight:700;src:url("../font/OpenSans-Bold.woff") format('woff')}@font-face{font-family:'Open Sans';font-style:italic;font-weight:300;src:url("../font/OpenSansLight-Italic.woff") format('woff')}@font-face{font-family:'Open Sans';font-style:italic;font-weight:400;src:url("../font/OpenSans-Italic.woff") format('woff')}@font-face{font-family:'Open Sans';font-style:italic;font-weight:700;src:url("../font/OpenSans-BoldItalic.woff") format('woff')}.container{margin-bottom:180px}
 a code{color:inherit}
 h1{font-size:36px}
 h2{font-size:30px}
diff --git a/public/res/extensions/workingIndicator.js b/public/res/extensions/workingIndicator.js
index f983fdc7..94abd60b 100644
--- a/public/res/extensions/workingIndicator.js
+++ b/public/res/extensions/workingIndicator.js
@@ -19,8 +19,8 @@ define([
         $('.working-indicator').append($workingIndicatorElt);
         for (var i = 0; i < 3; i++) {
             $workingIndicatorElt.append($('<div class="bar">').css({
-                'animation-delay': (i*15/100).toPrecision(3) + 's',
-                '-webkit-animation-delay': (i*15/100).toPrecision(3) + 's',
+                'animation-delay': (i*2/10).toPrecision(3) + 's',
+                '-webkit-animation-delay': (i*2/10).toPrecision(3) + 's',
             }));
         }
     };
diff --git a/public/res/styles/base.less b/public/res/styles/base.less
index 737e3522..614888b8 100644
--- a/public/res/styles/base.less
+++ b/public/res/styles/base.less
@@ -71,7 +71,7 @@
 }
 
 .container {
-    margin-bottom: 100px;
+    margin-bottom: 180px;
 }
 
 a code {