F offline

Merge offline/online feature into master