Support for links to entities
Merge branch 'Link2Userstory'