Merge branch 'fixes-requirements-conflict' into 'integration'

Fixes version conflict caused by py2neo

See merge request FLAME/flame-clmc!43

src/service/setup.py

@@ -53,6 +53,7 @@ def get_version(*relative_path):
 
 requires = [
     'ipython==6.5.0',
+    'jupyter_console==5.2.0',
     'plaster_pastedeploy==0.6',
     'pyramid==1.9.2',
     'pyramid_debugtoolbar==4.5',