fix
Merge branch 'textureManager' of https://github.com/Birkemose/cocos2d-iphone into textureManager