新增GEO和精细分词

Signed-off-by: huwq <huwq@ifeng.com>
更新搜索功能

Signed-off-by: huwq <huwq@ifeng.com>
Signed-off-by: huwq <huwq@ifeng.com>
Signed-off-by: huwq <huwq@ifeng.com>
Merge branch 'master' of https://github.com/hwq830/GCDP.git

Conflicts:
	src/main/java/com/me/GCDP/search/SearchHelper.java
	src/main/java/com/me/GCDP/search/SearchPlugin.java
	src/main/java/com/me/GCDP/template/TemplatePlugin.java
	src/main/java/com/me/GCDP/xform/FormService.java
	src/main/java/com/me/GCDP/xform/Template2.java
	src/main/resources/conf/search.properties
	src/main/resources/log4j.properties

Signed-off-by: huwq <huwq@ifeng.com>