add metadata from bitbucket.org/keimlink/metadata
Merge branch 'metadata'