- Switched to OpenGL 2.1
Merge branch 'master' into map_changes

- Merging master into map_changes to account for OpenGL 2.1