Merge branch 'master' into v0.9

Conflicts:
	archaeological_files/migrations/0014_auto__add_field_file_requested_operation_type__add_field_file_organiza.py

1 files changed, 2 insertions, 2 deletions

diff --git a/ishtar_common/templates/ishtar/wizard/confirm_wizard.html b/ishtar_common/templates/ishtar/wizard/confirm_wizard.html
index 9007c867c..1fbaadcd1 100644
--- a/ishtar_common/templates/ishtar/wizard/confirm_wizard.html
+++ b/ishtar_common/templates/ishtar/wizard/confirm_wizard.html
@@ -6,9 +6,9 @@
 <form action="." method="post">{% csrf_token %}
 <ul id='form_path'>
 {% for step in previous_steps %}
-  <li><button name="form_prev_step" value="{{forloop.counter0}}">{{step.form_label}}</button></li>
+  <li><button name="form_prev_step" value="{{forloop.counter0}}">{{step}}</button></li>
 {% endfor %}
-  <li class='current'><a href='#'>{{current_step.form_label}}</a></li>
+  <li class='current'><a href='#'>{{current_step_label}}</a></li>
 </ul>
 </form>
 <form action="." method="post">{% csrf_token %}