temp
Adding Joshs fixes
Merge branch 'experimental-josh' into experimental-marvin
Merge branch 'experimental-marvin' of https://github.com/marvins/GeoExplore into experimental-josh
added more documentation to opengl stuff
fixed relative path for doxygen images
Added more documentation to glwrappers classes should now be done