Changes

Changes
Merge branch 'master' of https://github.com/IAmTipsy/DungerMan

Conflicts:
	DungerMan/DungerMan-csharp.sln
	DungerMan/DungerMan.sln
	DungerMan/Library/CurrentLayout.dwlt
	DungerMan/Library/assetDatabase3
	DungerMan/Library/guidmapper
	DungerMan/Library/metadata/37/376d1702bedc9432da1119eacd1ddef4
	DungerMan/Library/metadata/6f/6fade1bede28d40ca81cdce822353be7
	DungerMan/Library/metadata/81/81a0355cbe65b490e8c4a79b6dcd824a
	DungerMan/Library/metadata/82/82ff3482c96f849ec854ea193bc60887
	DungerMan/Library/metadata/bb/bb92962ea107044518934224b22419dd
	DungerMan/Library/metadata/f2/f2b736f7da393434dab194ed249016bc
Merge branch 'master' of https://github.com/IAmTipsy/DungerMan

Conflicts:
	DungerMan/DungerMan-csharp.sln
	DungerMan/DungerMan.sln
	DungerMan/Library/InspectorExpandedItems.asset
	DungerMan/Library/ScriptAssemblies/Assembly-CSharp.dll
	DungerMan/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	DungerMan/Library/assetDatabase3
	DungerMan/Library/guidmapper