GI-862 Removed duplicate work from CCTextureCache
Merge branch 'gles20-reorg' of github.com:brooklynpacket/cocos2d-x into gles20-reorg