remove blackberry and marmalade port
travis build template too
fix error and compilings error in templates
add execution permission
assign 1 to predefined macro CC_ENABLE_CHIPMUNK_INTEGRATION
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
Merge branch 'releasing' of https://github.com/minggo/cocos2d-x into minggo-releasing
[Android] Fixing path error and reducing dependence for extension.
Merge pull request #12 from dumganhar/minggo-releasing

[Android] Fixing path error and reducing dependence for extension.
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