+ Added preparation for future offline mode
Merge branch 'Features/offline' into develop