moved movement to hostileentity
Merge origin/master