closed #4727, Support run sample projects with console.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into issue4727
Fix memory leak
+ [NEW]: setting the font for Editbox text
+ [NEW]: setting the font for Editbox placeholder
+ [NEW]: setting the color for Editbox placeholder
+ [NEW]: updated test cases to show the new functionality
small indentation fix
Update CCImage.cpp
Merge branch 'develop' into issue4727

Conflicts:
	tools/cocos2d-console
add update
Merge branch 'luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into luaruntime
Merge branch 'develop' into issue4727
Update the reference of submodule cocos2d-console.
[Jenkins][ci skip] Add [ci emptytest] command
closed #4847, Find ant path from system first when ANT_ROOT is not set.
fix the bug that `EditBox` can’t response that ‘changed’,`ended` and ‘return’ event for lua
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_fix
Remove hard codes
Remove hard codes
[Jenkins][ci skip] Fix 'localfile' parameter
Merge pull request #6293 from natural-law/issue4847

Find ant path from system first when ANT_ROOT is not set.
Merge pull request #6296 from lmskater/fix-ftp-home

[Jenkins][ci skip] Fix 'localfile' parameter