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.
issue #2768:Add LuaObjectBridge and LuaJavaBridge
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Bridge
[Dispatcher] New event dispatcher, first commit.
[win32] Removing CCAccelerometer.cpp.
TMX map polyline parse
issue #2782: shadertestSprite add lensFlare Sprite Test Case
closed #2782: shadertestSprite remove blank line
[EventDispatcher] Remove unused file(CCTouchDispatcher) reference in CCEGLView.mm.
[EventDispatcher] Refactoring Touch, Touch doesn't inherit from Object now. Using std::vector<Touch*> to dispatch event and a little performance improved.
[EventDispatcher] Fixing compilation error after changing of Touch(It doesn't inherit from Object).
[Dispatcher] Updating tools/tojs/.ini
[Dispatcher] Updating license of CCEventListener.cpp.
[Dispatcher] Reverting Touch, it should be inherited from Object for JSB.
[Dispatcher] Fixing touch bindings for JSB.
[Dispatcher] Fixing logic errors in CCScrollView after using EventDispatcher.
[Dispatcher] Updating Log message in CCAccelerationEventListener.cpp.
[Dispatcher] Updating Android.mk, and some refractor.