Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/personalisation/views.py

src/personalisation/admin_urls.py

@@ -7,6 +7,7 @@ from personalisation import views
 app_name = 'segment'
 urlpatterns = [
     url(r'^segment/(\d+)/$', views.overview, name='overview'),
+    # url(r'^segment/create/$', views.CreateSegmentView.as_view(), name='create'),
     url(r'^segment/(?P<segment_id>[0-9]+)/enable/$', views.enable, name='enable'),
     url(r'^segment/(?P<segment_id>[0-9]+)/disable/$', views.disable, name='disable'),
     # TODO: These might no longer be needed when using a modal