Conflicts:
	src/main/java/com/jaeksoft/searchlib/ClientCatalog.java
Improvement on replication, locking and index lifecycle management.
Conflicts:
	src/main/java/com/jaeksoft/searchlib/ClientCatalog.java
	src/main/java/com/jaeksoft/searchlib/web/controller/CommonController.java
Set default HTTP time out to 30 seconds.
Merge pull request #702 from emmanuel-keller/master

Improvement on replication, locking and index lifecycle management