issue #3956:Change tolua_fix.c to tolua_fix.cpp and modify the toluafix_pushusertype_ccobject function to get real type of object
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developDynamic

Conflicts:
	cocos/scripting/lua/bindings/LuaBasicConversions.h
	cocos/scripting/lua/bindings/lua_cocos2dx_physics_manual.cpp
issue #3956:Replace Object with Ref
issue #3956:Remove the usage of “tolua.cast”
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developDynamic
issue #3956:Update the related compile file
issue #3956:Remove some unrelated modification
fix compiling error cause by using 'fmaxf'.
only using std::max for window.
Merge pull request #5446 from Dhilan007/develop_movePDC

fix compiling error cause by using 'fmaxf'.
Merge pull request #5444 from samuele3hu/developDynamic

issue #3956:Modifyt the mechanism of toluafix_pushusertype_ccobject to pass the real typename to lua
[AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json
Merge pull request #5447 from CocosRobot/update_cocosfiles_1393227046

[AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json
Merge remote-tracking branch 'upstream/develop' into testconsolebug