Added "collection" information to objects in collections, so they known they are in a collection
Revert "Added "collection" information to objects in collections, so they known they are in a collection" as it is not working with corrent caching module

This reverts commit 0d9dfee3fcf53f626308715fc2a3bd9c73a5e991.
Merge branch 'development' into release