Merge branch 'master' into Develop

# Conflicts:
#	cps/config_sql.py
#	cps/ub.py
#	cps/web.py

cps/helper.py

@@ -796,6 +796,7 @@ def fill_indexpage_with_archived_books(page, database, db_filter, order, allow_s
 
 
 def get_typeahead(database, query, replace=('',''), tag_filter=true()):
+    query = query or ''
     db.session.connection().connection.connection.create_function("lower", 1, lcase)
     entries = db.session.query(database).filter(tag_filter).filter(func.lower(database.name).ilike("%" + query + "%")).all()
     json_dumps = json.dumps([dict(name=r.name.replace(*replace)) for r in entries])