Fixed edits, added id for actors to allow dependent destroy
Merge remote-tracking branch 'origin/master'