Merge 250df35 into 27b9b21

cairis/sql/init.sql

@@ -4172,10 +4172,12 @@ INSERT INTO priority_type values (3,'High');
 INSERT INTO domainproperty_type values(0,'Hypothesis');
 INSERT INTO domainproperty_type values(1,'Invariant');
 INSERT INTO asset_type values(0,'Information','Documented (paper or electronic) data or Intellectual Property used to meet the mission of an organisation.');
-INSERT INTO asset_type values(1,'Systems','Information Systems that process and store information (systems being a combination of information, software, and hardware assets and any host, client, or server being considered a system.');
+INSERT INTO asset_type values(1,'Systems','Information Systems that process and store information (systems being a combination of information, software, and hardware assets and any host, client, or server being considered a system).');
 INSERT INTO asset_type values(2,'Software','Software application and services -- such as operating systems, database applications, networking software, office applications, custom applications, etc. -- that process, store, or transmit information.');
 INSERT INTO asset_type values(3,'Hardware','Information Technology physical devices -- such as workstations, servers, etc -- that normally focus solely on the replacement costs for physical devices.');
 INSERT INTO asset_type values(4,'People','The people in an organisation who possess unique skills, knowledge, and experience that are difficult to replace.');
+INSERT INTO asset_type values(5,'Systems - General','Organisational, Groups, and Social Systems, of which may have, use, manage, and operate Information Systems that process, store, or transmit information.');
+INSERT INTO asset_type values(6,'System of Systems','The combination of Independent Systems (collaborating to achieve a new combined purpose and goal).');
 INSERT INTO obstacle_category_type values(0,'Confidentiality Threat');
 INSERT INTO obstacle_category_type values(1,'Integrity Threat');
 INSERT INTO obstacle_category_type values(2,'Availability Threat');