Merge remote-tracking branch 'origin/master'

Conflicts:
	mainwindow.cpp
Fix after problem