Merge branch 'master' of https://github.com/Weakie/COMProj

Conflicts:
	.classpath
Merge branch 'master' of https://github.com/Weakie/COMProj

Conflicts:
	bin/com/weakie/desktop/util/LogUtil.class
	bin/com/weakie/desktop/view/MainView$1.class
	bin/com/weakie/desktop/view/MainView$10.class
	bin/com/weakie/desktop/view/MainView$11.class
	bin/com/weakie/desktop/view/MainView$12.class
	bin/com/weakie/desktop/view/MainView$13.class
	bin/com/weakie/desktop/view/MainView$2.class
	bin/com/weakie/desktop/view/MainView$3.class
	bin/com/weakie/desktop/view/MainView$4.class
	bin/com/weakie/desktop/view/MainView$5.class
	bin/com/weakie/desktop/view/MainView$6.class
	bin/com/weakie/desktop/view/MainView$7.class
	bin/com/weakie/desktop/view/MainView$8$1.class
	bin/com/weakie/desktop/view/MainView$8$2.class
	bin/com/weakie/desktop/view/MainView$8$3.class
	bin/com/weakie/desktop/view/MainView$8.class
	bin/com/weakie/desktop/view/MainView$9.class
	bin/com/weakie/desktop/view/MainView.class
	bin/com/weakie/desktop/view/util/DataFormat.class
	bin/com/weakie/server/bean/JsonData.class
	bin/com/weakie/server/servlet/DataDispatcherServlet.class
	bin/com/weakie/share/bean/Point3D.class
	bin/com/weakie/share/bean/Speed.class
	bin/com/weakie/share/control/ActionDispatcherControl$DispatcherTask.class
	bin/com/weakie/share/control/ActionDispatcherControl.class
	bin/com/weakie/share/control/ProgressControl.class
	bin/com/weakie/share/control/bean/ActionCommand.class
	bin/com/weakie/share/control/gen/AbstractActionGenerator.class
	bin/com/weakie/share/control/gen/ActionBean.class
	bin/com/weakie/share/control/gen/ActionGeneratorProducer.class
	bin/com/weakie/share/control/gen/impl/DefaultActionGenerator$MyIterator.class
	bin/com/weakie/share/control/gen/impl/DefaultActionGenerator.class
	bin/com/weakie/share/control/gen/impl/DirectMoveActionGenerator$MyIterator.class
	bin/com/weakie/share/control/gen/impl/DirectMoveActionGenerator.class
	bin/com/weakie/share/jni/SendData$PtrData.class
	bin/com/weakie/share/jni/SendData.class
	bin/org/eclipse/wb/swt/SWTResourceManager.class