ProductPresentation refactoring.
Merge pull request #906 from intportg/dev

ProductPresentation refactoring.