Fixed #1615 Merge Master branch of Ccocos2d-Html5 to webgl20

Merge Master branch of Ccocos2d-Html5 to webgl20