Added cache of network
Merge branch 'feature/cached_network' into develop

Conflicts:
	server.js