local branch
Merge branch 'master' into temp

Conflicts:
	.classpath
	.project
	.settings/org.eclipse.jdt.core.prefs
	src/dso/Command.java
	src/dso/DSO.java
	src/dso/DSOEventCallback.java
	src/dso/DSObject.java
	src/dso/event/DSOEvent.java
	src/dso/event/DSOJoinEvent.java
	src/dso/event/DSOLockEvent.java
	src/dso/test/BigData.java
	src/dso/test/Test.java
	src/dso/test/TestClient.java
	src/dso/test/TestServer.java
	src/dso/thread/DSOClient.java
	src/dso/thread/DSOServer.java
	src/dso/thread/DSOServerThread.java
	src/dso/utils/Call.java
	src/dso/utils/Pair.java
	src/dso/utils/StreamUtils.java
	startclient.bat
	startserver.bat
Merge branch 'temp'