issue #2430:move Particle enum into class
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2430-modify_enum
issue #2430:move more Particle enum into class
issue #2430:move Director enum into class
issue #2430:move Configuration enum into class
issue #2430:use upper letter for enum item in ccGLStateCache.h
issue #2430:move ProgressTimer enum into class
closed #2356
1. Modify the JS binding of interface ProtocolAds::showAds.
2. Update the JS binding for plugin.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
Merge pull request #3241 from minggo/releasing

fix some errors for template
issue #2430:move GLProgram enum into class
closed #2431: Potential crash when loading js files.
Merge pull request #3250 from dumganhar/develop

closed 2431: Potential crash when loading js files.
issue #2430:move enum in ccTypes.h class
issue #2430:move Texture2D enum into class
issue #2404:Add more functions to Deprecated.lua and modify some .pkg files
issue #2404:Modify tab to spaces
issue #2430:move Menu enum into class
issue #2430:move Layer enum into class
issue #2430:change Image enum item to upper letter