second update
Merge branch 'master' of https://github.com/freyyy/Varden

Conflicts:
	DotSurvival/Assets/DotSurvival.unity
	DotSurvival/DotSurvival.userprefs
	DotSurvival/Library/CurrentLayout.dwlt
	DotSurvival/Library/InspectorExpandedItems.asset
	DotSurvival/Library/ScriptAssemblies/Assembly-CSharp.dll
	DotSurvival/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	DotSurvival/Library/assetDatabase3

scene update