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/services/simpleldap.py

@@ -29,10 +29,7 @@ _ldap = LDAP()
 
 
 def init_app(app, config):
-    global _ldap
-
     if config.config_login_type != constants.LOGIN_LDAP:
-        _ldap = None
         return
 
     app.config['LDAP_HOST'] = config.config_ldap_provider_url