Merge remote-tracking branch 'renshan/develop' into develop
review CCTMXTiledMap.js
Merge pull request #98 from Yangtb/develop

review CCTMXTiledMap.js