Port my variant of font-rendering over to dev branch -- adds correct alignment behavior.
Fix comment broken in last commit.
Win32 icons on template

Added icon to HelloCpp template, renamed the icon resource (so GLFW can
read it and put on window and taskbar), and removed unnecessary files
from projects.
TMX map polyline parse
Reset the addChild functions of SpriteBatchNode and add some lua deprecated functions
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTest
Delete some end lines
1. replace "CCFileUtils" to "FileUtils".
Merge pull request #3610 from chengstory/#4685

Rename
Merge pull request #3607 from samuele3hu/developTest

Reset the addChild functions of SpriteBatchNode and add some lua deprecated functions
Merge pull request #3402 from j4m3z0r/develop-emscripten

Port my variant of font-rendering over to dev branch -- adds correct ali...
[AUTO] : updating submodule reference to latest autogenerated bindings
Merge pull request #3612 from CocosRobot/updategeneratedsubmodule_1379311527

[AUTO] : updating submodule reference to latest autogenerated bindings
Merge pull request #3562 from bassarisse/develop

Win32 icons on template
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop