First Pass on the boss
Merge branch 'master' of https://github.com/Phoniks7/EGDGoodGrief

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Library/CurrentLayout.dwlt
	Library/CurrentMaximizeLayout.dwlt
	Library/assetDatabase3
	Library/guidmapper