Fixes race condition in resources

See #1378.
I agree with Miriam.  I think the sane system would be to have the classroom *be* the group, which is what the new system will basically move to.