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
Add Lua bindings for controller and related test case project
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_controller

Conflicts:
	cocos/scripting/lua-bindings/script/Cocos2dConstants.lua
Dispatch EVENT_RENDERER_RECREATED event when renderer was recreated on android/wp8.
Make clear EVENT_COME_TO_FOREGROUND event.
move JumoTo's copy constuctor and operator= to private
add cocostudio parser test template
add v1.4 tests
add Cocostudio 1.3,1.4, 1.5 ui tests
update cocostudio resource path
update ccs-res and add custom ImageView and custom particle widget support
fix linux and android compile
fix win32 & win8 compile error
move initWithDuration to CC_CONSTRUCTOR_ACCESS
1. fixes TextReader load default font error.
Update Nibiru SDK and remove prompt box of install driver .
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_controller

Conflicts:
	build/cocos2d_tests.xcodeproj/project.pbxproj
	cocos/scripting/lua-bindings/Android.mk
	cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj
	tools/tolua/genbindings.py
Enabled nibiru\moga\ouya controller support.
Fix build with -DCC_ENABLE_SCRIPT_BINDING=0 , it causes failed