Merge branch 'Develop'

# Conflicts:
#	cps/__init__.py
#	cps/about.py
#	cps/admin.py
#	cps/cli.py
#	cps/config_sql.py
#	cps/constants.py
#	cps/converter.py
#	cps/db.py
#	cps/editbooks.py
#	cps/gdriveutils.py
#	cps/helper.py
#	cps/logger.py
#	cps/oauth.py
#	cps/server.py
#	cps/services/simpleldap.py
#	cps/ub.py
#	cps/web.py
#	cps/worker.py
#	optional-requirements.txt
#	setup.cfg
#	setup.py

cps/admin.py

@@ -27,10 +27,6 @@ import base64
 import json
 import time
 from datetime import datetime, timedelta
-# try:
-#     from imp import reload
-# except ImportError:
-#     pass
 
 from babel import Locale as LC
 from babel.dates import format_datetime