fixed typo for OpenROV/openrov-image/issues/69
Merge branch 'master' into v2.5.1-rc1
Merge branch 'v2.5.1-rc1' of https://github.com/OpenROV/openrov-software into v2.5.1-rc1
fixed #305; removed large image
Merge pull request #301 from OpenROV/v2.5.1-rc1

Resync rc1 branch to master
Merge pull request #308 from BrianAdams/bug/305

fixed #305; removed large image
Merge branch 'master' into v2.5.1-rc1
Merge branch 'v2.5.1-rc1' of https://github.com/OpenROV/openrov-software into v2.5.1-rc1