It works!!!!
Merge remote-tracking branch 'origin/stan' into stan

Conflicts:
	Maze/mainwindow.cpp