Merge branch 'ma_2018/erraji' of https://git.rwth-aachen.de/ita/ITAPropagationPathSim into ma_2018/erraji