In the TODO file: removed the reference to JSON-LD and added a note on the semantic merge of metadata
Merge commit 'b66e5e015f9c0b169a07510c7153dfdb22e8574e' into after-tpac