Added Mingw-crt Support without breaking VS SDK
Update CCControlButton.cpp

fixed a bug when button's parent is hided, the button still can responce to clicked event
Log assert messages

Now, assert messages as visible in the trace output
as well as the line number of condition that failed.
Rename CCScriptSupport::executeAssert -> CCScriptSupport::handleAssert

Also remove the first "cond" argument, since it is always false.
Fixed issue when non-ascii string used in script
Fix incorrect colors in CCDrawNode.
Fixing CCScale9Sprites when loaded from CCB files to be able to change color and opacity
Fixing coloring in CCControlButtons by overriding the set/get color functions
fix Null pointer access
Added win32 support
Merge branch 'master' of https://github.com/sunzhuoshi/cocos2d-x
Updated README
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into cocos2d-master

Conflicts:
	tools/jsbcc/src/main.cpp
Added const to CCNode's getTag & getContentSize
issue #2103 Add more lua test case(Add  NodeChildrenTest of PerformanceTest)
issue #2103 Add more lua test case(Add  NodeChildrenTest of PerformanceTest)
issue #2103 Add more lua test case(Add  TextureTest of PerformanceTest)
issue #2103 Add more lua test case(Add  ToucheTest of PerformanceTest)
Merge pull request #2536 from sunzhuoshi/master

fixed #2106: Adding compile tool of JS bytecode for win32.
Merge pull request #2526 from djh-/master

fixed #2140: The displayed color of CCDrawNode is incorrect when VAO is disabled.