MOved voltage and current around
Merge branch 'develop' of https://github.com/doddi/SVDoubt

Conflicts:
	mainwindow.h
Fixed porting to windows isues when tried to run on linux again
fd
Merge branch 'develop'
Merge branch 'master' into develop