Discarded the old camera wrapper
Fix merge conflict
Merge branch 'master' of https://github.com/uissubsea/rov-topside