Merge branch 'master' into platform-admin

Conflicts:
	tests/app/main/views/test_dashboard.py

app/main/views/two_factor.py

@@ -16,6 +16,7 @@ from app.main.forms import TwoFactorForm
 @main.route('/two-factor', methods=['GET', 'POST'])
 def two_factor():
     # TODO handle user_email not in session
+
     try:
         user_id = session['user_details']['id']
     except KeyError: