Merge branch 'postRelease' of https://github.com/Kranchy/Looter into Anim

Conflicts:
	Project/Assembly-CSharp.csproj
	Project/Assets/Scenes/MainScene.unity
	Project/Library/CurrentLayout.dwlt
	Project/Library/InspectorExpandedItems.asset
	Project/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Project/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Project/Library/ScriptAssemblies/Assembly-CSharp.dll
	Project/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Project/Library/assetDatabase3
	Project/Library/expandedItems
	Project/Library/guidmapper
	Project/Library/metadata/05/057dce51de2108341869903427efec38
	Project/Library/metadata/f3/f3186cf7328314f4f81dfcfe48310721
	Project/Library/metadata/fb/fb34392bdde58db49beca05a66738793
	Project/Project-csharp.sln
	Project/Project.sln
Sound complete. Projectile damage.
merge
Merge branch 'Anim' of https://github.com/Kranchy/Looter into postRelease

Conflicts:
	Project/Assembly-CSharp.csproj
	Project/Assets/Scenes/MainScene.unity
	Project/Assets/Scripts/Managers/ItemMenu.cs
	Project/Library/CurrentLayout.dwlt
	Project/Library/InspectorExpandedItems.asset
	Project/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Project/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Project/Library/ScriptAssemblies/Assembly-CSharp.dll
	Project/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Project/Library/assetDatabase3
	Project/Library/expandedItems
	Project/Library/guidmapper
	Project/Library/metadata/03/03bad54806390bc4f88a7b64fa063d8f
	Project/Library/metadata/05/057dce51de2108341869903427efec38
	Project/Library/metadata/20/200921728595a15458b63925c350309b
	Project/Library/metadata/89/89fe1ef3137bf7f4cb9a8298c825b1d1
	Project/Library/metadata/f3/f3186cf7328314f4f81dfcfe48310721
	Project/Library/metadata/fb/fb34392bdde58db49beca05a66738793
	Project/Project-csharp.sln
	Project/Project.sln
Avant Show