particle designer2.0 support
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
modify particleSystem format erro
revising indent Erro
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
Merge pull request #3689 from yuye-liu/particle_designer_2

[ci skip]particle designer2.0 support