Manual merge with SOHBASE, EPICS library directory, and email messages u...

Merge in GRIFFINCollaboration changes