merged ui code
Merge branch 'master' of https://github.com/jonongjs/auv-vision-system