Merge branch 'hotfix/composer-repos' into develop
Merge branch 'hotfix/cs-fixes' into develop
Merge branch 'hotfix/collection-route-injection' into develop

Fixes issue with collections not having collection route injected
Improved link generation

- Improved link generation for resources inside collections
Merge branch 'feature/resource-linking' into develop
Merge branch 'develop'

Merged in improvements to link generation modification for resources inside collections.