Merge branch 'master' into testing

models/pm_req_analyse_debug.mvc

@@ -108,10 +108,6 @@ Data environment_EPN {
     name = "models/environment_EPN"
     type = "formalisms/Encapsulated_PetriNet"
 }
-Data merged_EPN {
-    name = "models/merged_EPN"
-    type = "formalisms/Encapsulated_PetriNet"
-}
 Data pn {
     name = "models/pn"
     type = "formalisms/PetriNet"
@@ -310,5 +306,5 @@ Consumes (print_control_EPN, control_EPN){
     name = "Encapsulated_PetriNet"
 }
 Consumes (print_env_EPN, environment_EPN){
-    name = "PW_Environment"
+    name = "Encapsulated_PetriNet"
 }