Merge branch 'master' into add-non-.py-files-to-MANIFEST

Author: Peter Izsak

doc/source/conf.py

@@ -149,7 +149,7 @@
     # 'vcs_pageview_mode': '',
     # Toc options
     'collapse_navigation': True,
-    'sticky_navigation': False,
+    'sticky_navigation': True,
     'navigation_depth': 4,
     'includehidden': True,
     'titles_only': False
@@ -164,7 +164,7 @@
 
 # The name of an image file (relative to this directory) to place at the top
 # of the sidebar.
-html_logo = ''
+html_logo = '../../assets/nlp_architect_header.png'
 
 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32