add another possible GLFW header location
Add the Lua bindings for FastTMXTileMap and FastTMXLayer,then add related test cases
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix
move JumoTo's copy constuctor and operator= to private
move initWithDuration to CC_CONSTRUCTOR_ACCESS
Fix compile errors on WP8
fix conflict
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix

Conflicts:
	tests/lua-tests/src/mainMenu.lua
	tools/tolua/cocos2dx.ini
Update the cocos2d.ini config
Merge pull request #7287 from samuele3hu/v3_hot_fix

Add the Lua bindings for FastTMXTileMap and FastTMXLayer,then add related test cases
fix warnings
Merge pull request #7411 from minggo/warning-fix

fix warnings
fixed warning: deleting pointer to incomplete type.
[AUTO]: updating luabinding automatically
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-game-controller
Fix the tests-lua crash on windows platform
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix
Merge pull request #7414 from samuele3hu/v3_hot_fix

Fix the tests-lua crash on windows platform
Merge pull request #7412 from Dhilan007/v3-320final

fixed warning: deleting pointer to incomplete type.
Merge pull request #7413 from CocosRobot/update_lua_bindings_1405071955

[AUTO]: updating luabinding automatically