Incorporated most (should be all) changes from the Main repo update that was posted.... finally.
Except for the files in the eve-server/ship directory.... those need much more study to combine!
More Incorporation.
files in the eve-server/ship directory are started but still not done! :(