test
Merge branch 'develop' of //SM4-PC/Development/mmroot/trunk into develop

Conflicts:
	plugins/MTTracker/src/org/ndaguan/micromanager/mmtracker/AcqAnalyzer.java
	plugins/MTTracker/src/org/ndaguan/micromanager/mmtracker/CalibrateAnalyzer.java
	plugins/MTTracker/src/org/ndaguan/micromanager/mmtracker/Function.java
	plugins/MTTracker/src/org/ndaguan/micromanager/mmtracker/MMTracker.java
	plugins/MTTracker/src/org/ndaguan/micromanager/mmtracker/OverlayRender.java
	plugins/MTTracker/src/org/ndaguan/micromanager/mmtracker/Preferences.java
	plugins/MTTracker/src/org/ndaguan/micromanager/mmtracker/TestAnalyzer.java
	plugins/mLoader/src/org/zephyre/mloader/MLoaderFrame.java
add project MTTracker into branch develop do some cleanup
Merge branch 'develop' of github.com:haizi-zh/micromanager into develop

Conflicts:
	plugins/MTTracker/src/org/ndaguan/micromanager/mmtracker/AcqAnalyzer.java
	plugins/MTTracker/src/org/ndaguan/micromanager/mmtracker/Function.java
	plugins/mLoader/src/org/zephyre/mloader/MLoaderFrame.java