Merge pull request #970 from dingpinglv/Iss2144_FixBugForParticleSystem

fixed #2144 modify condition for WebGL Mode.
issue #2264: update changelog
Merge pull request #973 from linshun/iss2264_v2.1.4

issue #2264: updated changelog