Added Sophistication field to Threat Actor, added ThreatActorSophisticationVocab-1.1
Added Sophistication field to Threat Actor, added ThreatActorSophisticationVocab-1.1
Fixed some merge conflicts and corrected the vocabulary version