partial work on particle system basis
made particles a little sexier
Merge remote-tracking branch 'origin/master' into dan-dev