Feature #4977: Fix compilation issues
Merge branch 'AssetManager' of https://github.com/pandamicro/cocos2d-x into AssetManager