Merge branch 'feature/Stokes-drag' into 'develop'

Feature/stokes drag

See merge request clalescu/turtle!26
2 jobs for develop in 7 minutes (queued for 3 seconds)