Fix merge conflicts from martell
Fixed minor typo in iscam.dat
Added WCVI shrimp trawl data.
Merge pcod in and make conflicts go away.
Fixed r4iSCAM so that it works with pcod and arrowtooth examples.
Fixed merge conflicts with cgrandin