* Added separator class for handling entity movement.
Merge origin/master