Reworked settings, now properly working with aldeon.conf file
Diff timeout and initPeers added to settings and properties manager, some css work
Merge branch 'feature-settings' into develop

Conflicts:
	src/main/resources/gui/css/style.css