Merge branch 'master' into philippTopologicalRevival

Conflicts:
	src/counterexamples/PathBasedSubsystemGenerator.h
	src/storm.cpp

Former-commit-id: 338637dcd6

src/counterexamples/SMTMinimalCommandSetGenerator.h

@@ -1818,6 +1818,7 @@ namespace storm {
                         psiStates = eventuallyFormula.getChild().check(modelchecker);
                     } catch (std::bad_cast const&) {
                         // If the nested formula is neither an until nor a finally formula, we throw an exception.
+						LOG4CPLUS_ERROR(logger, "Formula nested inside probability bound operator must be an until or eventually formula for counterexample generation.");
                         throw storm::exceptions::InvalidPropertyException() << "Formula nested inside probability bound operator must be an until or eventually formula for counterexample generation.";
                     }
                 }

src/storm.cpp

@@ -46,6 +46,7 @@
 #include "src/utility/ErrorHandling.h"
 #include "src/formula/Prctl.h"
 #include "src/utility/vector.h"
+#include "src/utility/OsDetection.h"
 
 #include "src/settings/Settings.h"
 // Registers all standard options