Merge branch 'Develop'

# Conflicts:
#	MANIFEST.in
#	README.md
#	cps/helper.py
#	cps/static/js/archive/archive.js
#	cps/translations/nl/LC_MESSAGES/messages.mo
#	cps/translations/nl/LC_MESSAGES/messages.po
#	cps/ub.py
#	cps/updater.py
#	cps/web.py
#	cps/worker.py
#	optional-requirements.txt

setup.cfg

@@ -2,7 +2,7 @@
 universal = 1
 
 [metadata]
-name = calibre-web
+name = calibreweb
 url = https://github.com/janeczku/calibre-web
 project_urls =
   Bug Tracker = https://github.com/janeczku/calibre-web/issues
@@ -11,8 +11,10 @@ project_urls =
   Source Code = https://github.com/janeczku/calibre-web
 description = Web app for browsing, reading and downloading eBooks stored in a Calibre database.
 long_description = file: README.md
-author = @janeczku
-maintainer = @janeczku
+long_description_content_type= text/markdown
+author = @OzzieIsaacs
+author_email = Ozzie.Fernandez.Isaacs@googlemail.com
+maintainer = @OzzieIsaacs
 license = GPLv3+
 license_file = LICENSE
 classifiers =
@@ -24,14 +26,17 @@ classifiers =
     Programming Language :: Python :: 3.5
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
+    Operating System :: OS Independent
 keywords =
   calibre
   calibre-web
   library
 
+[options.entry_points]
+console_scripts =
+  cps = calibreweb:main
 [options]
 python_requires = >=2.6
-packages = find:
 include_package_data = True
 zip_safe = False
 install_requires =
@@ -75,7 +80,7 @@ metadata =
   Wand >= 0.4.4
 comics=
   natsort>=2.2.0
-  comicapi @ git+https://github.com/wildthyme/comicapi.git@cb279168f9c5cec742b5a05ac8326b9c168a8a91#egg=comicapi
+  # https://github.com/wildthyme/comicapi/archive/cb279168f9c5cec742b5a05ac8326b9c168a8a91.zip#egg=comicapi
+  # comicapi @ git+https://github.com/wildthyme/comicapi.git@cb279168f9c5cec742b5a05ac8326b9c168a8a91#egg=comicapi
+  # find solution for this
 
-[options.packages.find]
-where = .