clean up of particle system
Merge remote-tracking branch 'upstream/master' into particles
removed deprecated code
more clean up
more clean up of particle system
Merge pull request #704 from Ventrella/particles

more code cleanup