Merge branch 'master' into schedule-api-notification

Conflicts:
	tests/app/v2/notifications/test_post_notifications.py

migrations/versions/0085_update_incoming_to_inbound.py

@@ -0,0 +1,22 @@
+"""empty message
+
+Revision ID: 0085_update_incoming_to_inbound
+Revises: 0084_add_job_stats
+Create Date: 2017-05-22 10:23:43.939050
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '0085_update_incoming_to_inbound'
+down_revision = '0084_add_job_stats'
+
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+def upgrade():
+    op.execute("UPDATE service_permission_types SET name='inbound_sms' WHERE name='incoming_sms'")
+
+
+def downgrade():
+    op.execute("UPDATE service_permission_types SET name='incoming_sms' WHERE name='inbound_sms'")

migrations/versions/0086_scheduled_notifications.py

@@ -1,7 +1,7 @@
 """empty message
 
-Revision ID: 0085_scheduled_notifications
-Revises: 0084_add_job_stats
+Revision ID: 0086_scheduled_notifications
+Revises: 0085_update_incoming_to_inbound
 Create Date: 2017-05-15 12:50:20.041950
 
 """
@@ -9,8 +9,8 @@ from alembic import op
 import sqlalchemy as sa
 from sqlalchemy.dialects import postgresql
 
-revision = '0085_scheduled_notifications'
-down_revision = '0084_add_job_stats'
+revision = '0086_scheduled_notifications'
+down_revision = '0085_update_incoming_to_inbound'
 
 
 def upgrade():