AH-422 Made some name changes within the particle XML-file.
AH-422 change from water to smoke

Made it possible to have a base color based on the definition of the particle system.
Merge remote-tracking branch 'origin/master' into AH-422_Particles_XML-files