FIx shaders for OpenGL 3.1 usage
Merge branch 'ubuntu_13.04'
Merge branch 'master' of github.com:hpicgs/cg2sandbox