Merge branch 'master' of edugit.org:Teckids/BiscuIT/BiscuIT-ng

BiscuIT-App-Exlibris @ ad8af3fe

-Subproject commit c5fc8d14df1893a9cf6acddaf6cd7a72a30592ee
+Subproject commit ad8af3fe185217a5d95a7880d7d594089ad818b7

biscuit/core/templates/core/base.html

@@ -2,11 +2,11 @@
 {% extends "bootstrap4/bootstrap4.html" %}
 {% load bootstrap4 menu_generator staticfiles font_awesome any_js sass_tags %}
 
-{% block bootstrap4_title %}BiscuIT School Information System{% endblock %}
 
 {% block bootstrap4_extra_head %}
  {% fa_css %}
  {% include_css "DataTables-Bootstrap4" %}
+ <title>{% block bootstrap4_title %}BiscuIT School Information System{% endblock %}</title>
  <link rel="stylesheet" href="{% sass_src 'bootstrap_colours.scss' %}" />
  <link rel="stylesheet" href="{% static 'css/style.css' %}" />
  <link rel="shortcut icon" href="#" />
@@ -24,7 +24,7 @@
      {% fa 'fa-align-justify' %}
     </button>
     <a class="navbar-brand" href="{% url "index" %}">
-     <span class="glyphicon glyphicon-briefcase"></span> BiscuIT School Information System
+     {% fa 'fa-briefcase' %} BiscuIT School Information System
     </a>
 
    <div class="collapse navbar-collapse" id="navbar-main">