Yes and no.  Gym Heroes contains cards from Both Gym 1 and Gym 2, but it is not an all inclusive set.  This means that while cards from both sets got printed, there are cards from both sets that did not get printed.  We expect the majority of the cards that did not get printed in Gym Heroes will be printed in Gym Challenge when it comes out.

Scott