Merge branch 'develop' into 'master'

Develop

See merge request vtmk/web2.0!112

templates/password_reset/base.html

@@ -1 +1 @@
-{% extends "login_base.html" %}
+{% extends "login.html" %}

webapp/templates/base.html

@@ -6,7 +6,6 @@
 
 {% block styles %}
 <link rel="stylesheet" href="{% static "webapp/css/base.css" %}">
-<link rel="stylesheet" href="{% static "webapp/css/webapp.css" %}">
 <link rel="stylesheet" href="{% static "webapp/css/header.css" %}">
 <link rel="stylesheet" href="{% static "webapp/css/footer.css" %}">
 {% endblock styles %}

webapp/templates/navigation.html

@@ -1,5 +1,4 @@
 {% load i18n %}
-<link rel="stylesheet" href="/static/css/main_nav.css">
 <nav class="navbar navbar-toggleable-md navbar-light bg-faded">
     <ul class="navbar-nav mx-auto">
         <li class="nav-item text-center">