Signed-off-by: ycx <ycx@ccs>
Merge branch 'master' of https://github.com/sgewuhan/visionadapter.git

Conflicts:
	com.sg.plmadapter/src/com/sg/plmadapter/adapters/WindchillService.java

Signed-off-by: ycx <ycx@ccs>
Signed-off-by: ycx <ycx@ccs>