Merge branch 'master' into cancel_pledge

frontend/templates/book_panel.html

@@ -4,6 +4,7 @@
 {% with work.cover_image_thumbnail as thumbnail %}
 {% with work.author as author %}
 {% with work.last_campaign.status as status %}
+{% with work.last_campaign.deadline as deadline %}
 <div class="thewholebook listview tabs {% if first_ebook %}tabs-1{% else %}{% if status == 'SUCCESSFUL' or status == 'ACTIVE' %}tabs-2{% else %}tabs-3{% endif %}{% endif %}">
 <div class="listview book-list">
     <div class="listview panelback side2">
@@ -190,3 +191,4 @@
 {% endwith %}
 {% endwith %}
 {% endwith %}
+{% endwith %}