update
Merge branch 'master' of github.com:chongyangxue/JavaAgent

Conflicts:
	src/test/java/com/sachiel/agent/test/testClient.java