Merge branch 'GL'

Conflicts:
	src/novo/gfx/gl/obj.cpp