Merge remote-tracking branch 'origin/Design' into Design

Conflicts:
	Link-Object_prototype_withboxes/Intermediate/CachedAssetRegistry.bin
	Link-Object_prototype_withboxes/Saved/AutoScreenshot.png

	Link-Object_prototype_withboxes/Saved/Config/Windows/EditorUserSettings.ini
	Link-Object_prototype_withboxes/Saved/Logs/MyProject2.log

sacrifice update

started work on setting up doorways
Merge remote-tracking branch 'origin/Design' into Design

Conflicts:
	Link-Object_prototype_withboxes/Intermediate/CachedAssetRegistry.bin
	Link-Object_prototype_withboxes/Saved/AutoScreenshot.png

	Link-Object_prototype_withboxes/Saved/Config/Windows/EditorUserSettings.ini
	Link-Object_prototype_withboxes/Saved/Logs/MyProject2.log
Merge branch 'Design' of https://github.com/SpaceVinesStudios/Space_Vines into Design

Conflicts:
	Link-Object_prototype_withboxes/Saved/Logs/MyProject2.log