Testing merge
Merge branch 'master' of https://github.com/sardylan/qtbalrx

Conflicts:
	confwindow.cpp
	mainwindow.cpp