making json links unique except for specific rels
Merge branch 'master' into couple-child-relationship