Merge branch 'epub' into dev

Conflicts:
	themes/baggy/home.twig

diff --cc inc/poche/Poche.class.php
Simple merge

diff --cc themes/baggy/home.twig
index 8df5ce1ca0dda82800ab9b4e145679fa49589670,ef2e097c1cfb8050d2c5de287a136a209140b1cb..3942d3bf8aef4396db5f0dc4ee1541ce60e48b0e
--- 1/themes/baggy/home.twig
--- 2/themes/baggy/home.twig
+++ b/themes/baggy/home.twig
@@@ -56,8 -56,12 +56,14 @@@
  
                  {% endfor %}
              </div>
+             {{ block('pager') }}
              {% if view == 'home' %}{% if nb_results > 1 %}<a title="{% trans "Mark all the entries as read" %}"  href="./?action=archive_all">{{ "Mark all the entries as read" }}</a>{% endif %}{% endif %}
++
 +            {% if search_term is defined %}<a title="{% trans %} Apply the tag {{ search_term }} to this search {% endtrans %}" href="./?action=add_tag&search={{ search_term }}">{% trans %} Apply the tag {{ search_term }} to this search {% endtrans %}</a>{% endif %}
+             
+             {% if tag %}<a title="{% trans "Download the articles from this tag in an epub" %}" href="./?epub&amp;method=tag&amp;tag={{ tag.value }}">{% trans "Download the articles from this tag in an epub" %}</a>
+             {% elseif search_term is defined %}<a title="{% trans "Download the articles from this search in an epub" %}" href="./?epub&amp;method=search&amp;search={{ search_term }}">{% trans "Download the articles from this search in an epub" %}</a>
+             {% else %}<a title="{% trans "Download the articles from this category in an epub" %}" href="./?epub&amp;method=category&amp;category={{ view }}">{% trans "Download the articles from this category in an epub" %}</a>{% endif %}
+             
              {% endif %}
-             {{ block('pager') }}
  {% endblock %}