Merge branch 'master' of git.parisson.com:git/diggersdigest

Conflicts:
	diggersdigest/templates/base.html

diff --cc diggersdigest/templates/base.html
index c1669f44b342034509e410770fe8b99996587ad8,7fa7f87263f7f26971d292539aa90c7f691af37b..5fe8e66f9cfabb2342de344ee321aa252890ea4f
--- 1/diggersdigest/templates/base.html
--- 2/diggersdigest/templates/base.html
+++ b/diggersdigest/templates/base.html
@@@ -105,7 -108,14 +105,6 @@@
  
  <div class="container">
  <div class="row">
 -{% comment - Remove left panel%}
 -<div class="col-md-2 left">
 -    {% block left_panel %}
 -    <div class="panel panel-default tree">{% page_menu "pages/menus/tree.html" %}</div>
 -    {% endblock %}
 -</div>
 -{% endcomment %}
--
  <div class="col-md-9 middle">
      {% block main %}{% endblock %}
  </div>