Merge branch 'dev' into crem

Conflicts:
	telemeta/templates/telemeta/base.html

diff --cc telemeta/models/media.py
Simple merge

diff --cc telemeta/templates/telemeta/base.html
index 422437913721f036e6afbaab48e116ca7842ee9b,f798fd34c6b9607e7e3ac4dfaf8aafe48c32f957..73fda62cdbc69d51f638d24abb8f84709b17eff7
--- 1/telemeta/templates/telemeta/base.html
--- 2/telemeta/templates/telemeta/base.html
+++ b/telemeta/templates/telemeta/base.html
@@@ -45,7 -45,7 +45,7 @@@
  <div id="header">
  <div id="logo">
  {% block logo %}
- <a href="{% url telemeta-home %}"><img src="{% url telemeta-images "logo_crem.png" %}" alt="Telemeta" /></a>
 -<a href="{% url telemeta-home %}"><img src="{{ STATIC_URL }}telemeta/images/logo_lam3.png" alt="Telemeta" /></a>
++<a href="{% url telemeta-home %}"><img src="{{ STATIC_URL }}telemeta/images/logo_crem.png" alt="Telemeta" /></a>
  {% endblock %}
  </div>