Added material and shaders for smoke particles.
Fixed merge conflict.