File by File merge with MISO LIMS branch modifications. Introduction of the MetrixDecorator classes.