Conflicts:
	src/main/java/com/jaeksoft/searchlib/ClientCatalog.java