Merge branch 'enhance_4_simpler_entry_access' into feature_8_ssh_keys_configuration_virtual_machine

Conflicts:
	README.rst