Refactored SetMaster methods to omit 'BySite' in method name
Changed CreateView to return the actual created view
Conflict resolution for merge request 146