컨플릭트 해결하여 커밋.
Merge branch 'master' of https://github.com/fastcatsearch/fastcatsearch-ir.git

Conflicts:
	src/main/java/org/fastcatsearch/ir/search/CollectionHandler.java
Merge branch 'master' of https://github.com/fastcatsearch/fastcatsearch-ir.git