Fixed some offline mode things
Fixed network stuff
Merge remote-tracking branch 'origin/master'
Fixed conflicts