Updated particlesystem, made it a function
Merge remote-tracking branch 'origin/develop'