Merge branch '20180130-geetest' of http://git.quantgroup.cn/head_group/xyqb-user2 into 20180130-geetest

# Conflicts:
#	src/main/java/cn/quantgroup/xyqb/Constants.java
#	src/main/java/cn/quantgroup/xyqb/aspect/captcha/CaptchaNewValidateAdvisor.java
#	src/main/java/cn/quantgroup/xyqb/service/captcha/GeetestLib.java
#	src/main/java/cn/quantgroup/xyqb/service/captcha/IQuantgroupCaptchaService.java
#	src/main/java/cn/quantgroup/xyqb/service/captcha/geetest/sdk/GeetestLib.java
#	src/main/java/cn/quantgroup/xyqb/service/captcha/impl/GeetestCaptchaServiceImpl.java
#	src/main/java/cn/quantgroup/xyqb/service/captcha/impl/QuantgroupCaptchaServiceImpl.java
#	src/main/java/cn/quantgroup/xyqb/service/captcha/impl/sdk/GeetestLib.java