Preliminary texture system
Compile-time bugs fixed
Added texture system to makefile
Merge new code from master
Merge branch 'master' into resource-managers
Texture and Shader management incorparation complete
Merge from master