main change - new base

deleted test code
Merge branch 'master' of https://github.com/bobbyziom/AquaControl

Conflicts:
	ImageImportProject/ImageImportProject.userprefs
	ImageImportProject/ImageImportProject/MainWindow.cs