Updating mainwindow.cpp and mainwindow.h
Merge branch 'feature/bresia_branch' into develop

Conflicts:
	mainwindow.cpp
	mainwindow.h