In the middle of trying to go to new openGL code in the main
Merge branch 'master' into dev
Some minor changes in the header files. Working on changing to modern openGL code.