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

Conflicts:
	tmt/.classpath
	tmt/Windchill/codebase/login/loginWelcome.jsp
	tmt/Windchill/src/com/ptc/windchill/uwgm/common/autoassociate/DefaultAutoAssociatePartFinderCreator.java
	tmt/Windchill/src/ext/tmt/integration/webservice/spm/SPMWebserviceImpl.java
	tmt/Windchill/src/ext/tmt/part/listener/PartHelper.java
Merge branch 'master' of https://github.com/sgewuhan/visionadapter.git

Conflicts:
	tmt/Windchill/src/ext/tmt/EPMdoc/listener/EPMDocHelper.java