Updating:
	mainwindow.cpp
	mainwindow.h

So it can communicate to the server.
Pushing changes
Merge branch 'feature/bresia_branch' into develop

Conflicts:
	mainwindow.cpp