working on fishing fleet dynamics and slx
Merge branch 'MartellDeveloper' of https://github.com/awhitten/gmacs into MartellDeveloper