Merge branch 'master' into networking
Basic movement
Re-add network fixes
Merge branch 'networking'