fix issue #31
Merge branch 'master' of https://github.com/medcl/elasticsearch-analysis-ik

Conflicts:
	pom.xml
	src/main/java/org/wltea/analyzer/dic/Dictionary.java
	src/main/java/org/wltea/analyzer/lucene/IKTokenizer.java