Manually arranged nodes in canvas to be more tree like for presentation
Fixed merge
Fixed merge conflicts left in file
Fixed merge conflicts left in file
Fixed merge conflicts left in file
Nodes now appear inside canvas, with latest UI. Ready to present
Merge branch 'master' into mauraUI
branches work now
Merge branch 'mauraUI' into MainUI

Conflicts:
	mainwindow.ui