Issue #2814: Migrate cc.TableView to Cocos2d-x 2.1.5
Issue #2803: updated CHANGELOG.txt and AUTHORS.txt, updated version number and fixed two bugs for releasing v2.1.6
Issue #2803: correct a mistake in AUTHORS.txt
Issue #2803: update a wiki link
Merge pull request #1133 from dingpinglv/Iss2803_V2.1.6Release

Issue #2803: Updated CHANGELOG.txt and AUTHORS.txt, updated version number and fixed two bugs for releasing v2.1.6
Issue #2803: update submodule reference
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Iss2803_V2.1.6Release
Merge pull request #1134 from dingpinglv/Iss2803_V2.1.6Release

Issue #2803: update submodule reference
fixed #2806: Correct the errors of CCLabelTTF that labelHeightDiv show on uc browser.
Bug #2806: Correct the errors of CCArmatureDefine for Cocos2d-Html5 releasing
Merge pull request #1135 from xingsenma/develop

fixed #2806: Correct the errors of Tests for Cocos2d-Html5 releasing
Issue #2803: correct some mistakes in AUTHORS.txt
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Iss2803_V2.1.6Release
Merge pull request #1136 from dingpinglv/Iss2803_V2.1.6Release

Issue #2803: correct some mistakes in AUTHORS.txt
Issue #2803: Update authors of Cocos2d-html5
Merge pull request #1137 from dingpinglv/Iss2803_V2.1.6Release

Issue #2803: Update authors of Cocos2d-html5
Issue #2803: update submodule reference
Merge pull request #1138 from dingpinglv/Iss2803_V2.1.6Release

Issue #2803: update submodule reference
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