Merge branch 'master' into cuda_a_dev

Samples/4_CUDA_Libraries/oceanFFT/oceanFFT.cpp

@@ -45,13 +45,15 @@
 #include <windows.h>
 #endif
 
+// includes for OpenGL
+#include <helper_gl.h>
+
 // includes
 #include <cuda_gl_interop.h>
 #include <cuda_runtime.h>
 #include <cufft.h>
 #include <helper_cuda.h>
 #include <helper_functions.h>
-#include <helper_gl.h>
 #include <math.h>
 #include <math_constants.h>
 #include <stdio.h>