Start work on advanced network options
Merge branch 'develop' into feature/AdvancedNetwork

Conflicts:
	main.cpp
System is working using advanced properties.
More structure cleanup
Merge branch 'feature/AdvancedNetwork' into develop