Merge pull request #5 from cocos2d/develop

merge 15/4
Merge pull request #6 from cocos2d/develop

merge 18/4
WebP format is ready and polished the smart sprite sheet setting
Merge pull request #331 from longyangxi/dev0418

WebP format is ready and the smart sprite sheet settings are polished