Who plays with which heroes in the Inferno faction?

There is a difference in version 3.1; the bug regarding demons has been fixed, and the Gatekeeper now appears after gathering troops, as it should, rather than after diplomacy.