Merge WRENCH branch without breaks
I was writing some Batsim tests and I discovered that the last merge attempt of wrench into master broke energy algorithms.
Adding proper tests in batsched would help.
@pdutot I brutally reverted the merge by removing this part of the history, the merge is still pending.