Merge remote-tracking branch 'origin/master'

Collectibles implemented.
Safe object deletion functions added. PLEASE USE THEM!