GPII-341: added ontology transformations in one of the files
GPII-341: made some additions and corrections in the ontology
GPII-342: Copied ontology stuff to the second ontology file
GPII-341, GPII-342: Updated solution entries, inverse rules and NP sets to adhere to new pilot terms
GPII-341,GPII-342: Fixed stupid error in linux.json
Merge remote-tracking branch 'kaspermarkus/GPII-341'

* kaspermarkus/GPII-341:
  GPII-341,GPII-342: Fixed stupid error in linux.json
  GPII-341, GPII-342: Updated solution entries, inverse rules and NP sets to adhere to new pilot terms
  GPII-342: Copied ontology stuff to the second ontology file
  GPII-341: made some additions and corrections in the ontology
  GPII-341: added ontology transformations in one of the files
Merge branch 'master' into GPII-75