Merge up to r866 in svn: with new surface types and sedimentation options, for minibasins and combined minibasins with progradation; clean up formatting