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

cps/templates/readcbr.html

@@ -28,8 +28,8 @@
     };
     document.onreadystatechange = function () {
       if (document.readyState == "complete") {
-        init("{{ url_for('serve_book', book_id=comicfile, book_format=extension) }}");
-        updateArrows();
+      	init("{{ url_for('web.serve_book', book_id=comicfile, book_format=extension) }}");
+      	updateArrows();
       }
     }
   </script>