Merge branch 'dev' into crfpa

diff --cc teleforma/templates/telemeta/base.html
index 5b838996a60d658c572a768a8130aef0a16e3d6c,a5305e4e94a768733569450facefc16fc279cb02..386faaf12f88e7865f609b2d0ce1c12d6df34557
--- 1/teleforma/templates/telemeta/base.html
--- 2/teleforma/templates/telemeta/base.html
+++ b/teleforma/templates/telemeta/base.html
@@@ -132,10 -132,14 +132,14 @@@ alt="logo" /
  
   {% if user.is_authenticated %}
    {% if user.is_staff %}
-   <li><a href="{% url teleforma-users 0 0 0 %}" class="blue">{% trans "Users" %}</a></li>
-   <li><a href="{% url telemeta-admin-general %}" class="blue">{% trans "Admin" %}</a></li>
+   <li><a href="#admin#" class="blue">{% trans "Admin" %}</a>
+    <ul>
+     <li><a href="{% url telemeta-admin-general %}">{% trans "General" %}</a></li>
+     <li><a href="{% url teleforma-users 0 0 0 %}">{% trans "Users" %}</a></li>
+     </ul>
+   </li>
    {% else %}
 -   <li><a href="{% url teleforma-help %}" class="green">{% trans "Help" %}</a></li>
 +   <li><a href="{% url teleforma-help %}" class="blue">{% trans "Help" %}</a></li>
   {% endif %}
  
   <li style="a.active{background-image:{{ STATIC_URL }}telemeta/images/user_tr_bk.png; background-repeat: no-repeat;