Start of the day push, pt. 2
Merge branch 'master' of https://github.com/kingofthyhill/dragonSlayer

Conflicts:
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/metadata/7b/7bea4e27f939c4940a3ba97cf13e5076
	Library/metadata/a6/a628df415b8353543baf12e69815610e
	dragonSlayer-csharp.sln
	dragonSlayer.sln