made some integration changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Medical Imaging System/bin/ImageViewerMenuBar$DefaultStudy.class
	Medical Imaging System/bin/ImageViewerMenuBar$ToDispMode1.class
	Medical Imaging System/bin/ImageViewerMenuBar$ToDispMode4.class
	Medical Imaging System/bin/ImageViewerMenuBar.class