Merge pull request #3 from cocos2d/develop

new merge
Merge pull request #4 from cocos2d/develop

merge
#31 feature completed version1
#31 feature completed version2
Merge pull request #319 from longyangxi/dev0412

#31 feature completed except the WebP format implementation