apply stashed changes
Merge remote branch 'origin/master'

Conflicts:
	src/main/java/org/wltea/analyzer/sample/IKAnalzyerDemo.java
customize the ik to fit our requirements