Merge branch 'work' of https://github.com/fducha/senioruty into work

Conflicts:
	mainwindow.ui