Trying to get user table layout correct
Merge branch 'develop' into feature/nt-cmplt_branch
Accidentally removed channel->text's default text
Merge branch 'develop' into feature/nt-cmplt_branch

Conflicts:
	mainwindow.cpp
Merge branch 'develop' of https://github.com/technicallyerik/WIRK into develop