Signed-off-by: jinxitao <jxt@yaozheng.com.cn>
Merge branch 'master' of https://github.com/sgewuhan/vision.git

Conflicts:
	com.sg.thirdparty/.classpath