Bug #4580: Fix API inconsistence in Constants between h5 and jsb
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
rename constants of ParticleSystem
Merge pull request #282 from joshuastray/master

Bug #4580: Fix API inconsistence in Constants between h5 and jsb