temp
added updates to try and fix build issues
fixed problem with OpenGL not linking correctly the variable was OPENGL_LIBRARIES not OpenGL_LIBRARY :P
Merge remote-tracking branch 'origin/experimental-marvin' into experimental-josh
uncommented build of terrain-explore
Adding Joshs fixes
Merge branch 'experimental-josh' into experimental-marvin