abo
Merge branch 'master' of https://github.com/naiad-auv/naiad-auv-software

Conflicts:
	src/software/simulator/gui/main
fix after ubuntu crash