Added hasTexture
Added NULL return for getTexture
Merge branch 'feature/has-texture' into develop