Add timestamp to entity attributes
Merge branch 'xifi' into develop
Add contribution policy
Merge branch 'xifi' into develop