PresentationLayer Update (II)
Merge branch 'master' of https://github.com/voxmures/prop-project