Edited CollectFisheryCatch  to take SCAT, calculate current time steps catch (in weight) with error and bias.
Editied CollectFisheryCPUE to take SCAT, Effort array, calculate 2D CPUE in current year.
Merge branch 'master' of github.com:SNAPwg/SNAP