The old good time
Merge branch 'develop' of //SM4-PC/Development/mmroot/trunk into develop
Merge branch 'develop' of github.com:haizi-zh/micromanager into develop
delete all old
Please enter the commit message for your changes. Lines starting
TEST COMMIT
Merge branch 'develop' of github.com:haizi-zh/micromanager into develop

Conflicts:
	plugins/ZIndexMeasure/.externalToolBuilders/ZIndexMeasure_Builder.launch
	plugins/ZIndexMeasure/build.xml
	plugins/ZIndexMeasure/src/org/ndaguan/micromanager/AcqAnalyzer.java
	plugins/ZIndexMeasure/src/org/ndaguan/micromanager/CMMCore.java
	plugins/ZIndexMeasure/src/org/ndaguan/micromanager/MyForm.java
	plugins/ZIndexMeasure/src/org/ndaguan/micromanager/MyGUI.java
	plugins/ZIndexMeasure/src/org/ndaguan/micromanager/TCPServer.java
	plugins/ZIndexMeasure/src/org/ndaguan/micromanager/TCPServerTest.java
	plugins/ZIndexMeasure/src/org/ndaguan/micromanager/ZIndexMeasure.java
	plugins/ZIndexMeasure/src/org/ndaguan/micromanager/myCalculator.java
	plugins/ZIndexMeasure/src/org/ndaguan/micromanager/packageAnalyzer.java
	plugins/ZIndexMeasure/src/org/zephyre/micromanager/ZIndexMeasure/OverlayRender.java
	plugins/ZIndexMeasure/src/org/zephyre/micromanager/ZIndexMeasure/TextAreaQueue.java
	plugins/multRoiCalc/build.xml
	plugins/multRoiCalc/icons/Thumbs.db
	plugins/multRoiCalc/src/org/ndaguan/micromanager/AcqAnalyzer.java
	plugins/multRoiCalc/src/org/ndaguan/micromanager/ChartManager.java
	plugins/multRoiCalc/src/org/ndaguan/micromanager/Function.java
	plugins/multRoiCalc/src/org/ndaguan/micromanager/ItemData.java
	plugins/multRoiCalc/src/org/ndaguan/micromanager/Kernel.java
	plugins/multRoiCalc/src/org/ndaguan/micromanager/KernelDemo.java
	plugins/multRoiCalc/src/org/ndaguan/micromanager/Listener.java
	plugins/multRoiCalc/src/org/ndaguan/micromanager/MultZIndexMeasure.java
	plugins/multRoiCalc/src/org/ndaguan/micromanager/OverlayRender.java
	plugins/multRoiCalc/src/org/ndaguan/micromanager/PackageAnalyzer.java
	plugins/multRoiCalc/src/org/ndaguan/micromanager/PreferDailog.java
	plugins/multRoiCalc/src/org/ndaguan/micromanager/Preferences.java
	plugins/multRoiCalc/src/org/ndaguan/micromanager/RoiItem.java
	plugins/multRoiCalc/src/org/ndaguan/micromanager/StageControlFrame.java
	plugins/multRoiCalc/src/org/ndaguan/micromanager/ZIndexMeasureFrame.java
Add file