Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator

Conflicts:
	scripting/lua/cocos2dx_support/generated/lua_cocos2dx_auto.cpp
	scripting/lua/cocos2dx_support/generated/lua_cocos2dx_auto.hpp
	scripting/lua/cocos2dx_support/generated/lua_cocos2dx_auto_api.js
issue #2433:update submodule
issue #2460: glfw mac keyboard input
issue #2460: glfw linux keyboard input
issue #2460: glfw windows keyboard input
issue #2460: optimize EGLView interface
issue #2460: remove comment code
issue #2460: travis scripts
issue #2460: script compile error
issue #2460: script compile error
issue #2433:Modify platform config and some test samples
issue #2433:Replace ccDraw** in DrawPrimitives with draw**
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator-new

Conflicts:
	tools/tolua/cocos2dx.ini
issue #2433:Rename pointSize function name as setPointSize and Modify bindings-nerator
issue #2433:Modify template/multi_platform_lua/Resources/hello.lua
Ooops, reverting optimization for C

still valid for Neon, but the current optimization is not valid for C.

Please, apply this patch otherwise cocos2d won't work correctly
on simulator, windows, linux, mac, etc...
compiles on ARM
Merge pull request #3511 from ricardoquesada/kazmath_bug_fix

Ooops, reverting optimization for C
Merge pull request #3510 from samuele3hu/iss2433-lua-bindings-generator-new

Iss2433:Add deprecated class and enums and modify some project config and test samples
[AUTO] : updating submodule reference to latest autogenerated bindings