Merge pull request #331 from pandamicro/master

Fixed #5021: Upgrade to cocos2d-x branch v3 and fix errors in binding
Feature #5016: Add conversions for BlendFunc
Feature #5016: Remove manual binding of BlendFunc
Feature #5016: Add js wrapper to support two parameters in setBlendFunc
Feature #5016: Stop skip (g|s)etBlendFunc in config file
Feature #5016: Stop skip (g|s)etBlendFunc in config files
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js