Merge branch 'gles20-reorg' of github.com:brooklynpacket/cocos2d-x into fg-async
Fix map iterator deletion
Merge branch 'fg-async' of github.com:brooklynpacket/cocos2d-x into gles20-reorg