Merge pull request #596 from sorlok/collision_defs

Normalized instance_activate/deactivate functions in the collision system