Merge branch 'mnelson4-use-super-block' into v2.2.1

Author: mkalioby

mfa/templates/MFA.html

@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% load static %}
 {% block head %}
+{{block.super}}
     <script type="text/javascript">
     function confirmDel(id) {
         $.ajax({
@@ -39,6 +40,7 @@
     <script src="{% static 'mfa/js/bootstrap-toggle.min.js'%}"></script>
 {% endblock %}
 {% block content %}
+{{block.super}}
     <br/>
     <br/>
     <div class="container">