Major change to particle effects.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/neurogame/main/GameController.java
local changes