Merged CapabilityStrategicObjectiveType and CapabilityTacticalObjectiveType into CapabilityObjectiveType. Removed idref from CapabilityType nad added CapabilityReferenceType to CapabilityListType via xs:choice. Lots of annotation tweaks