changes to windowing structure
trying to fix merge issues
Merge branch 'master' of https://github.com/makeitsonumber2/vision-testing-tools

Conflicts:
	colorSegamentation.pro.user