Fixing gcc compatibility bug with cycIterator +
  Fixing issues with newer material names in ess stuff.

Still to do : Merge from Alberto ESS model.
            : Merge from Goran.