Merge branch 'master' of https://github.com/josefs/autosar

Conflicts:
ARSim.hs
Merge acrobatics