compile error fix
merge fix
Merge branch 'master' of https://github.com/Cocos2DXNA/cocos2d-xna
Fix for issue #448 from @lordnedux
Merge remote-tracking branch 'upstream/master'

Conflicts:
	cocos2d/textures/CCTextureCache.cs