Made network settings functional
Merge branch 'network-settings' into develop
Merge branch 'develop'