Phoenix and Haggar revealed for Marvel vs. Capcom 3