django-mfa2

Merge v3.2

Version v3.1.2

Fix issue in Email method

Four changes plus template adjustments

Changed a variable from 'token' to 'storedhash' because it was conflicting with the arg 'token'. Changed user.username to session['base_username']. Added request.session.save()