socket bug
Merge branch 'develop' into encrypto
Merge branch 'encrypto' of https://github.com/liangjingyang/quick-cocos2d-x into encrypto
Merge branch 'encrypto' of https://github.com/liangjingyang/quick-cocos2d-x into encrypto
Merge branch 'encrypto' of https://github.com/liangjingyang/quick-cocos2d-x into encrypto