Mostly completed floor 2 layout
Merge branch 'master' of https://github.com/AndrewKliphon/HGame

Conflicts:
	Content/ArchVis/Materials/M_Painting_1.uasset
	Content/Blueprints/BP_Locked_Door.uasset