Every resource now also holds a zip identifier to the archive it is contained in.
Merge branch 'master' into Demo
error free main