latest changes including correction to the FMU fmiDoStep code
Revert "latest changes including correction to the FMU fmiDoStep code"

This reverts commit c3e108011d082c327ebd9c70bf4f34361aeccc63.
Merge branch 'master' of https://github.com/andyed2003/aegit.git