- fixed the conflicts
- commit classpath, because it will be overwrite.
Merge branch 'master' of https://github.com/wchen057/Test-Java.git

Conflicts:
	src/rt/code/soap/client/HelloWorldClient.java