testing time, removed curl2
Merge branch 'devel' of https://github.com/aaronsmooth/ShipSensing into devel