Background flashing, fft outline, resting force.
Merge branch 'master' into stages

Conflicts:
	3DViz/src/ParticleSystem.cpp
	3DViz/src/ParticleSystem.h
	3DViz/src/testApp.cpp