relaxed ray-tracing test
Merge branch 'memo-magma' of https://github.com/memo/VolumeRunner into daniel
changing magma system
magma updates
magma firing working in shader
key changes
Camera collision and forward lookat fixes
settings
Merge branch 'daniel' of https://github.com/memo/VolumeRunner into memo-magma

Conflicts:
	VolumeRunnerApp/bin/data/ofxMSAControlFreak/MSAControlFreak/default.xml
settings