Merge pull request #784 from marioprats/master

adding uwsim_osgocean