Merge remote-tracking branch 'renshan/develop' into develop
review CCTMXTiledMap.js