Merge pull request #1 from cocos2d/develop

Merge from trunk
Update CCTextureCache.js

1、Fix error that cc.TextureCache.dumpCachedTextureInfo() will crash when there are cc.LabelBMFont has been created
2、Fix bug when calculate HTMLCanvasElement 's memory
Update CCTextureCache.js

fix code format
Merge pull request #1140 from WanderWang/develop

Fix  cc.TextureCache.dumpCachedTextureInfo 's bug