fixed merge conflict
New tpl from Steve
Merge pcod in and make conflicts go away.
Fixed r4iSCAM so that it works with pcod and arrowtooth examples.
Fix WIN32 headers for iscam.tpl #includes
Actually fix arrowtooth example including WCVI shrimp trawl
Fixed conflicts