Merge branch 'master' into AL_print

models/cbd_design.mvc

@@ -1,7 +1,7 @@
 include "primitives.alh"
 
-Class Float {}
-Class String {}
+SimpleAttribute Float {}
+SimpleAttribute String {}
 
 Class Block{}
 Class ICBlock{}

wrappers/modelverse.py

@@ -131,7 +131,7 @@ def __run_new_modelverse_activity(address, username, password, taskname, pipe, c
                 response = pipe.recv()
 
                 if response.name == "output":
-                    controller.addInput(Event("data_input", "action_in", [response.parameters, context]))
+                    controller.addInput(Event("data_input", "action_in", [response.parameters, None]))
                 else:
                     raise Exception("Unknown data from SC to MV: " + str(response))
                 empty = False

wrappers/modelverse_SCCD.py

@@ -1,7 +1,7 @@
 """
 Generated by Statechart compiler by Glenn De Jonghe, Joeri Exelmans, Simon Van Mierlo, and Yentl Van Tendeloo (for the inspiration)
 
-Date:   Wed Apr  4 14:07:17 2018
+Date:   Wed Apr  4 16:40:16 2018
 
 Model author: Yentl Van Tendeloo
 Model name:   MvK Server