Merge pull request #4 from cocos2d/master

Merge from the latest version of cocos2d
Added config macro for "spine" extension
Fixed javascript constant names auto-generated
Merge branch 'master' of https://github.com/sunzhuoshi/cocos2d-x
Removed config macro for "spine" extension
Merge pull request #3165 from sunzhuoshi/master

Fixed bad js constant names and added config macro for "spine" extension