Merge branch 'issue_43' of https://github.com/STIXProject/schemas into timestamp
Changed @timestamp_ref to @timestamp and modified annotations accordingly on the following types:
IndicatorBaseType
IncidentBaseType
TTPBaseType
ExploitTargetBaseType
CourseOfActionBaseType
CampaignBaseType
ThreatActorBaseType
CampaignReferenceType
RelatedPackageRefType
Changed @timestamp_ref to @timestamp and modified annotations accordingly on STIXType
Removed the Edited with XMLSpy comment
Merge branch 'version_1.1' into timestamp
Merge branch 'version_1.1' into timestamp
Merge pull request #129 from STIXProject/timestamp

Merging timestamp branch into version_1.1