project properties
properties mac
Merge branch 'master' into catarina