added child_restored and cog_restored events -- fire instead of added events in the case of server restart
Merge remote-tracking branch 'origin/master'