Adjusted thruster_control for stm board
Merge remote-tracking branch 'upstream/master'
Added a timeout to the z_drive
Merge remote-tracking branch 'upstream/master'