Use shadow inputs as cur. state inputs in condacts
Merge pull request #166 from chsticksel/develop

Use shadow inputs as cur. state inputs in condacts
Stupid merge things.