Merge branch 'structure' of https://github.com/lypant/archon into structure

Conflicts:
	setup/basic/disks_preparation/partition_disks.sh
	setup/functions.sh
	setup/settings.conf
	setup/setup_basic.sh
Merge branch 'structure' of https://github.com/lypant/archon into structure

Conflicts:
	setup/settings.conf