Smoke particle plus some other things
Merge remote-tracking branch 'origin/master'

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

This reverts commit c9b5734f8a35204abdd08dd71b793a5021f82a2a.