Implemented conditioning on future
Merge branch 'dev/full_sample' into exp/cond/fut
bugfix in integrated model
Merge branch 'hotfix' into develop