Merge branch 'hotfix/40'

Close #40
[#47] Ensure links generated from metadata are retained

- createEntity() was creating a new Entity instance that composed the original
  object after calling createEntityFromMetadata(); this lost any links that were
  generated during that call, meaning that they were no longer rendered.
Merge branch 'hotfix/47' into develop

Forward port #47