Merge branch 'django-1.8' into 'master'

Django 1.8 - Integrating EDRI

Integrating EDRI logo, and finalizing thngs before going live on production.

See merge request !5

nnmon/templates/about.html

@@ -16,12 +16,10 @@
 <ul>
    <li class="logo-org"><img alt="BoF logo" src="{%media_url%}/img/bof.png" /><a href="https://www.bof.nl">Bits of Freedom</a></li>
    <li class="logo-org"><img alt="LQDN logo" src="{%media_url%}/img/lqdn.png" /><a href="https://www.laquadrature.net/">La Quadrature du Net</a></li>
-</ul>
-<h3>{% trans "Supporters" %}</h3>
-<ul>
    <li class="logo-org"><img alt="ORG logo" src="{%media_url%}/img/org.png" /><a href="https://www.openrightsgroup.org/">Open Rights Group</a></li>
    <li class="logo-org"><img alt="NURPA logo" src="{%media_url%}/img/nurpa.png" width="80" style="text-align: center; background:#446688"/><br /><a href="http://nurpa.be"><small>Net Users' Rights Protection Association</small></a></li>
    <li class="logo-org"><img alt="XNet logo" src="{%media_url%}/img/xnet.png" /><a href="https://xnet-x.net/">X&nbsp;Net</a></li>
+   <li class="logo-org"><img alt="EDRI logo" src="{%media_url%}/img/edri.png" /><a href="https://edri.org/">X&nbsp;Net</a></li>
 </ul>
 </div>
 {% endblock %}