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/logger.py

@@ -102,15 +102,20 @@ def setup(log_file, log_level=None):
 
     log_file = _absolute_log_file(log_file, DEFAULT_LOG_FILE)
 
+    log_level = log_level or DEFAULT_LOG_LEVEL
+    logging.getLogger(__package__).setLevel(log_level)
+
     r = logging.root
-    r.setLevel(log_level or DEFAULT_LOG_LEVEL)
+    if log_level >= logging.INFO or os.environ.get('FLASK_DEBUG'):
+        # avoid spamming the log with debug messages from libraries
+        r.setLevel(log_level)
 
     previous_handler = r.handlers[0] if r.handlers else None
     if previous_handler:
         # if the log_file has not changed, don't create a new handler
         if getattr(previous_handler, 'baseFilename', None) == log_file:
             return
-        r.debug("logging to %s level %s", log_file, r.level)
+        logging.debug("logging to %s level %s", log_file, r.level)
 
     if log_file == LOG_TO_STDERR:
         file_handler = StreamHandler()
@@ -162,5 +167,3 @@ class StderrLogger(object):
                 self.buffer += message
         except Exception:
             self.log.debug("Logging Error")
-
-