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

# Conflicts:
#	bin/caretta-app-demo

setup.py

@@ -4,7 +4,7 @@ setup(name='caretta',
       version='1.0',
       authors=["Janani Durairaj", "Mehmet Akdel"],
       packages=["caretta"],
-      install_requires=["numpy", "numba", "prody", "biopython", "fire"],
+      install_requires=["numpy", "numba", "prody", "biopython", "fire", "pyparsing"],
       extras_require={
           '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",