Improved link generation

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