fixed can't type chinese.
Merge pull request #6069 from Dhilan007/develop_label

fixed can't type chinese.
[AUTO]: updating luabinding automatically
Add ignored `Makefile` file for building luajit
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_socket
Merge pull request #6070 from CocosRobot/update_lua_bindings_1396255857

[AUTO]: updating luabinding automatically
fixed warn in test case.
fixed warn.
Merge pull request #6074 from samuele3hu/develop_socket

Add ignored `Makefile` file for building luajit
update test case.
Merge pull request #6075 from Dhilan007/develop_label

fixed warnings in LabelTest.
[AUTO][ci skip]: updating cocos2dx_files.json
Merge pull request #6076 from CocosRobot/update_cocosfiles_1396259549

[AUTO][ci skip]: updating cocos2dx_files.json
Label:fixed possible blink if label contains shadow.
Merge pull request #6077 from Dhilan007/develop_label

Label:fixed possible blink if label contains shadow.