Fixing a race condition in the object serialization
Merge branch 'staging' of https://github.com/AustinHeerwagen/SMU_SoftEng_AVStream into staging