Removes unused variable (GLViewProtocol::_delegate) and relevant method (GLViewProtocol::setTouchDelegate).
Merge pull request #5285 from dumganhar/unused

Removes unused variable (GLViewProtocol::_delegate) and relevant method (GLViewProtocol::setTouchDelegate).
fix timeout getting status of sockets in Console::loop()

'016000' - is octal constants, 016000 == 7168
http://msdn.microsoft.com/en-us/library/00a1awxf.aspx
Merge pull request #5286 from maksqwe/console_fix

fix timeout getting status of sockets in Console::loop()
Merge pull request #1 from cocos2d/develop

Merge from trunk
Update README.md
Merge pull request #5287 from WanderWang/develop

fix a mistake about README
ios template compiles OK
Merge pull request #5288 from ricardoquesada/template_fixes

ios template compiles OK
log() in win32 doesn't add extra \n
Merge pull request #5290 from ricardoquesada/console_win32_fix

log() in win32 doesn't add extra \n
Typo fixed
issue #3900: JSBool -> bool, JS_TRUE -> true, JS_FALSE -> false.
issue #3900: JSBool -> bool, JS_TRUE -> true, JS_FALSE -> false.
fix:Compile error of the project that lua template generate on the iOS platform
Merge pull request #5293 from samuele3hu/developDynamic

fix:Compile error of the project that lua template generate on the iOS platform
fix:Compile error of the project that js template generate on the iOS platform
issue #3900: TestJavascript could run on Mac platform with spidermonkey v27.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developDynamic
Merge pull request #5294 from samuele3hu/developDynamic

fix:Compile error of the project that js template generate on the iOS platform