Fixed the "Assertion `!pthread_mutex_lock(m)' failed" error.
Merge branch 'hydro-devel' of https://github.com/marioprats/underwater_simulation into hydro-devel