Merge branch 'master' into ai

...va/de/tudresden/inf/st/mquat/benchmark/SolverFactory.java

jastadd-mquat-benchmark/src/main/resources/scenarios.json

...tudresden/inf/st/mquat/solving/ilp/AbstractILPSolver.java

...ava/de/tudresden/inf/st/mquat/solving/ilp/GLPKSolver.java

...a/de/tudresden/inf/st/mquat/solving/ilp/GurobiSolver.java

...e/tudresden/inf/st/mquat/solving/ilp/ILPDirectSolver.java

...tudresden/inf/st/mquat/solving/ilp/ILPExternalSolver.java

...n/java/de/tudresden/inf/st/mquat/solving/ilp/ILPMain.java

...ava/de/tudresden/inf/st/mquat/solving/ilp/SCIPSolver.java

...e/tudresden/inf/st/mquat/solving/GLPKHandwrittenTest.java

...tudresden/inf/st/mquat/solving/GurobiHandwrittenTest.java

...a/de/tudresden/inf/st/mquat/solving/ILPObjectiveTest.java

.../java/de/tudresden/inf/st/mquat/solving/ILPSolveTest.java

...e/tudresden/inf/st/mquat/solving/SCIPHandwrittenTest.java