Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into iss2264_v2.1.4
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into iss2264_v2.1.4
issue #2264: updated samples commit ID
Merge pull request #968 from linshun/iss2264_v2.1.4

issue #2264: updated samples commit ID