FrontPanel Fred
Olympus included
delete unused Panel
Merge branch 'master' of https://github.com/Fredxxx/uManagerPlugins

Conflicts:
	FLIMPlateReaderGUI/nbproject/project.properties
	FLIMPlateReaderGUI/src/com/github/dougkelly88/FLIMPlateReaderGUI/GUIComponents/FLIMControls.java
	FLIMPlateReaderGUI/src/com/github/dougkelly88/FLIMPlateReaderGUI/GUIComponents/FrontPanel.form
	FLIMPlateReaderGUI/src/com/github/dougkelly88/FLIMPlateReaderGUI/GUIComponents/FrontPanel.java
	FLIMPlateReaderGUI/src/com/github/dougkelly88/FLIMPlateReaderGUI/GUIComponents/LightPathControls.form
	FLIMPlateReaderGUI/src/com/github/dougkelly88/FLIMPlateReaderGUI/GUIComponents/LightPathControls.java
	FLIMPlateReaderGUI/src/com/github/dougkelly88/FLIMPlateReaderGUI/GUIComponents/XYZControls.java