Merge remote-tracking branch 'origin/master' into 3773

Conflicts:
	org.fortiss.af3.phoenix.product.tests/tests-src/org/fortiss/af3/phoenix/product/tests/AllTests.java

Signed-off-by: Alexander Diewald <diewald@fortiss.org>

.gitignore

-**/target/
+/*/bin/
+/*/build/
+/*/generated-src/
+/*/target/
+/target/
+*.rej
+.DS_Store
+._.DS_Store

org.fortiss.af3.phoenix.product.tests/tests-src/org/fortiss/af3/phoenix/product/tests/AllTests.java

@@ -25,12 +25,14 @@ import org.junit.runners.Suite.SuiteClasses;
  */
 @RunWith(Suite.class)
 // @CodeFormatterOff
-@SuiteClasses({ test.org.fortiss.af3.expression.AllTests.class, test.org.fortiss.af3.component.AllTests.class,
-		test.org.fortiss.af3.exploration.AllSMTTests.class,
-		test.org.fortiss.af3.state.ui.AllTests.class, test.org.fortiss.af3.rcp.application.AllTests.class, // CCodeEquivalenceTest
+@SuiteClasses({ test.org.fortiss.af3.expression.AllTests.class,
+		test.org.fortiss.af3.component.AllTests.class,
+		test.org.fortiss.af3.state.ui.AllTests.class,
+		test.org.fortiss.af3.rcp.application.AllTests.class, // CCodeEquivalenceTest
 		test.org.fortiss.af3.state.AllTests.class, // testInitializeSimulator and testIncorrectConnections
 		test.org.fortiss.af3.tools.AllTests.class, // make shell gcc don't work on my comp
-		test.org.fortiss.af3.testing.random.AllTests.class, test.org.fortiss.af3.testing.AllTests.class })
+		test.org.fortiss.af3.testing.random.AllTests.class,
+		test.org.fortiss.af3.testing.AllTests.class })
 // @CodeFormatterOn
 public class AllTests {
 	// empty class