Merge branch 'master' of C:\Users\pebs74\PhpstormProjects\clipit_master with conflicts.
Merge branch 'master' of C:\Users\pebs74\PhpstormProjects\clipit_master with conflicts.
ClipitRemoteSite: new class for public content and info from remote ClipIt Sites
ClipitSite: added public scope materials and remote site array
Merge remote-tracking branch 'origin/master'
ClipitRemoteSite: new class for public content and info from remote ClipIt Sites
ClipitSite: added public scope materials and remote site array
ClipitRemoteSite: new class for public content and info from remote ClipIt Sites
ClipitSite: added public scope materials and remote site array
ClipitRemoteSite: new class for public content and info from remote ClipIt Sites
ClipitSite: added public scope materials and remote site array
ClipitRemoteSite: new class for public content and info from remote ClipIt Sites
ClipitSite: added public scope materials and remote site array
ClipitRemoteSite: new class for public content and info from remote ClipIt Sites
ClipitSite: added public scope materials and remote site array