Merge branch 'master' of https://github.com/SPRFMO/jack_mackerel

Conflicts:
	Code/admb/mod4.3.ctl
	Code/admb/mod4.4.ctl
Merge branch 'master' of https://github.com/SPRFMO/jack_mackerel

Conflicts:
	Code/admb/mod4.3.ctl
	Code/admb/mod4.4.ctl