Merge branch 'merge-attempt-1' of...

Merge branch 'merge-attempt-1' of git.rwth-aachen.de:monticore/EmbeddedMontiArc/applications/carlacomponents into merge-attempt-1

Bumpbot/Bumpbot.json

 {
-  "modelsDir": "models/",
-  "outputDir": "target/",
+  "modelsDir": "Bumpbot/models/",
+  "outputDir": "Bumpbot/target/",
   "rootModel": "bumper.bumpBot",
   "generators": ["cpp", "roscpp"]
 }

Bumpbot/models/bumper/BumpbotTest.stream → Bumpbot/models/bumper/BumpBotTest.stream

 package bumper;
 
-stream BumpbotTest for Bumpbot{
+stream BumpbotTest for BumpBot{
     // Input
     vehicle_status.velocity: 0;
     vehicle_status.acceleration: 0;

Bumpbot/pom.xml

@@ -28,13 +28,13 @@
         <version>0.0.6-SNAPSHOT</version>
         <configuration>
           <pathMain>Bumpbot/models</pathMain>
-          <pathTest>Bumpbot/src/test/emam</pathTest>
+          <pathTest>Bumpbot/models</pathTest>
 	  <runStreamTestBefore>true</runStreamTestBefore>
           <pathTmpOut>Bumpbot/target/tmp</pathTmpOut>
           <generator>MinGW</generator>
           <pathMiddlewareOut>Bumpbot/target/middleware</pathMiddlewareOut>
           <middlewareRootModels>
-              <param>test.bumpBot</param>
+              <param>bumper.bumpBot</param>
           </middlewareRootModels>
         </configuration>
         <executions>