Documentation comments added, conflicts resolved

Resubmission of documentation changes in
IMaster.h
IOutstation.h