Merge branch 'master' into celery-jobs

Conflicts:
	tests/app/conftest.py

app/dao/invited_user_dao.py

@@ -1,6 +1,16 @@
 from app import db
 
+from app.models import InvitedUser
+
 
 def save_invited_user(invited_user):
     db.session.add(invited_user)
     db.session.commit()
+
+
+def get_invited_user(service_id, invited_user_id):
+    return InvitedUser.query.filter_by(service_id=service_id, id=invited_user_id).first()
+
+
+def get_invited_users_for_service(service_id):
+    return InvitedUser.query.filter_by(service_id=service_id).all()