Merge pull request #968 from linshun/iss2264_v2.1.4

issue #2264: updated samples commit ID
fixed #2144 modify condition for WebGL Mode.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Iss2144_FixBugForParticleSystem
Merge pull request #971 from dingpinglv/Iss2144_FixBugForParticleSystem

fixed #2144 modify condition for WebGL Mode.