Merge remote-tracking branch 'upstream/master'

src/storm/adapters/CarlAdapter.h

@@ -9,7 +9,6 @@
 #include <carl/core/Relation.h>
 #include <carl/core/SimpleConstraint.h>
 #include <carl/util/stringparser.h>
-#include <carl/formula/Formula.h>
 
 namespace carl {
     // Define hash values for all polynomials and rational function.

src/storm/analysis/GraphConditions.h

@@ -4,6 +4,7 @@
 #include <unordered_set>
 #include "storm/adapters/CarlAdapter.h"
 #include "storm/models/sparse/Dtmc.h"
+#include <carl/formula/Formula.h>
 
 namespace storm {
     namespace analysis {
@@ -73,4 +74,4 @@ public:
 
 
     }
-}
+}