candle colliders, flame stuff, new cone, blah

Conflicts:
	GrandpaBlows/Library/CurrentLayout.dwlt
	GrandpaBlows/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	GrandpaBlows/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	GrandpaBlows/Library/assetDatabase3
	GrandpaBlows/Library/expandedItems
	GrandpaBlows/Library/guidmapper
Merge remote-tracking branch 'origin/master'

Conflicts:
	GrandpaBlows/GrandpaBlows-csharp.sln
	GrandpaBlows/GrandpaBlows.sln
	GrandpaBlows/Library/CurrentLayout.dwlt
	GrandpaBlows/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	GrandpaBlows/Library/assetDatabase3
	GrandpaBlows/Library/guidmapper
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 1a35848ce3e3b81f8d6628644319d29cb3147586.