수정.
Merge branch 'master' of https://github.com/fastcatgroup/fastcatsearch

Conflicts:
	server/src/main/java/org/fastcatsearch/plugin/analysis/AnalysisPluginSetting.java