fix conflicts
Revert "fix conflicts"

This reverts commit 6e3718007afe3b02d78ea919d47902df4bb3aa03.
First Version of Geometry + Volume Renderer
MultiVolume Render (With Geometry)
testing region growing
fixed merge conflicts and on compile issues with the new volume renderer
added condition variable and mutex to MetaImageStreamer
Fixed some issues on the nvidia windows system
Added a gitignore file
Created the VTKSurfaceFileExporter
Merge branch 'master' of github.com:smistad/FAST
Fixed building CL program every frame
fixed a bug with OpenGL interop on the nvidia gpu linux system
added a simple benchmark
added some more benchmarks
updated OUL
upated OUL
updated OUL
fixed a bug in MetaImageImporter resulting in a zero matrix transformation if no transform matrix was set in mhd file
fixed a bug in MetaImageImporter resulting undefined matrix transformation if no offset set in mhd file