Merge pull request #55 from pisaychuk/master

Old properties and base classes removed, small fix in Util class
fix of expected expression in PrismProcessSnSTest
Property file for prism changed to Merlin.properties