issue #2430:fix android compiling error
Merge pull request #13 from dumganhar/iss2430-modify_enum

issue #2430: Fixing compilation errors for Mac and JSB projects.
Merge pull request #3257 from minggo/iss2430-modify_enum

move enum into class
[AUTO] : updating submodule reference to latest autogenerated bindings
issue #2404: DrawPrimitives deprecated.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2430-modify_enum
Merge pull request #3258 from CocosRobot/updategeneratedsubmodule_1374762976

[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2430-modify_enum