- corrected versioning info for development branch.
- fixed incorrect function call in shader compiler.
Merge branch 'master' into v2.x

Conflicts:
	src/gl/shaders/gl_shader.cpp