artikel properties
Merge branch 'properties'