Merge branch 'master' into email-templates

Conflicts:
	app/user/rest.py
	tests/app/user/test_rest.py

tests/app/conftest.py

@@ -32,7 +32,8 @@ def sample_user(notify_db,
         'email_address': email,
         'password': 'password',
         'mobile_number': '+447700900986',
-        'state': 'active'
+        'state': 'active',
+        'permissions': []
     }
     usr = User.query.filter_by(email_address=email).first()
     if not usr: