(I really should remember to pull before I merge...)
Conflicts:
src/modelchecker/AbstractModelChecker.h
src/modelchecker/GmmxxDtmcPrctlModelChecker.h
src/modelchecker/GmmxxMdpPrctlModelChecker.h
src/modelchecker/SparseDtmcPrctlModelChecker.h
src/modelchecker/SparseMdpPrctlModelChecker.h
src/modelchecker/TopologicalValueIterationMdpPrctlModelChecker.h
src/storm.cpp