eclipse
Merge branch 'master' of
https://github.com/fastcatsearch/fastcatsearch.git

Conflicts:
	.classpath