Merge branches 'doc' and 'master' of https://git.wur.nl/durai001/caretta

# Conflicts:
#	bin/caretta-app-demo

setup.py

@@ -6,7 +6,7 @@ setup(name='caretta',
       packages=["caretta"],
       install_requires=["numpy", "numba", "prody", "biopython", "fire"],
       extras_require={
-          'GUI': ["dash==1.3.1", "dash-bio==0.1.4",
+          'GUI': ["dash==1.3.1", "dash-bio==0.1.4", "cryptography",
                   "dash-core-components==1.2.1", "dash-html-components==1.0.1", "dash-renderer==1.1.0",
                   "dash-table==4.3.0", "plotly==3.7.1", "flask"]
       })