Refactor starring of resources

+ resolve of branch merge conflicts