Merge with master.

app/main/views/add_service.py

@@ -8,7 +8,6 @@ from flask import (
 from flask_login import login_required
 
 from app.main import main
-from app.main.dao import services_dao
 from app.main.forms import AddServiceForm
 from app.notify_client.models import InvitedUser
 
@@ -32,7 +31,7 @@ def add_service():
         invite_api_client.accept_invite(service_id, invitation.id)
         return redirect(url_for('main.service_dashboard', service_id=service_id))
 
-    form = AddServiceForm(services_dao.find_all_service_names)
+    form = AddServiceForm(service_api_client.find_all_service_names)
     heading = 'Which service do you want to set up notifications for?'
     if form.validate_on_submit():
         session['service_name'] = form.name.data