fix runaway backup bug
Merge pull request #4000 from ZappoMan/backupBugFix

fix runaway backup bug
Fix for model uploading to work

Fix for model uploading to work. The deleted elements were causing an
error when trying to upload models.
Merge pull request #4001 from cozza13/20244

CR for Job #20244 - Fix model upload on Editentities
guards for NULL collisions, possible fix to fountain crash
Merge pull request #4002 from ZappoMan/fountainCrash

guards for NULL collisions, possible fix to fountain crash
Merge branch 'master' of https://github.com/highfidelity/hifi into temp0
Fixing typo and syntax