ChangedVariable names in viewmodel to make it compile, viewmodel to be removed in future
Merge branch 'master' of https://github.com/naiad-auv/naiad-auv-software