..
Merge branch 'master' of https://github.com/daqingllm/jieli-rest

Conflicts:
	src/test/java/com/jieli/test/http/yolanda/FeatureTest.java