Merge remote branch 'origin/fg-async' into gles20-reorg
Merge branch 'gles20-reorg' of github.com:brooklynpacket/cocos2d-x into gles20-reorg