Building and tested
Merge branch 'develop' of https://github.com/doddi/SVDoubt

Conflicts:
	mainwindow.h