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

Conflicts:
	DungerMan/DungerMan-csharp.sln
	DungerMan/DungerMan.sln
	DungerMan/Library/AssetServerCacheV3
	DungerMan/Library/CurrentLayout.dwlt
	DungerMan/Library/assetDatabase3
	DungerMan/Library/expandedItems
	DungerMan/Library/guidmapper
	DungerMan/Library/metadata/69/6909f265f6ca6482abf6a5d3e0f9f165