Refactored networking to remove dependency upon game
Merge origin/master