alternative network service
import cleanup
Merged 'develop'.
small cleanup of imports
Finish demo