Fix motion for ball shot
Merge remote-tracking branch 'origin/network' into network