Another bugfix
Merge branch 'master' of github.com:lbproductions/LBGui

Conflicts:
	src/mainwindow.cpp