Merge branch 'network-sync'

diff --cc src/client/networkmodel.cpp
Simple merge

diff --cc src/common/network.cpp
Simple merge

diff --cc src/common/network.h
Simple merge