change collection and collectiontype linking
Merge branch 'feature/init_classes' into feature/rest_services