tried adding progressbar
Merge branch 'master' into Experimental_Progressbar

Conflicts:
	ToolKit/Source/MainWindow.cpp
	ToolKit/Source/MainWindow.h
removed comments and unused variables