Client-side game updates
Merge branch