+ [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
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
Flipping RenderTexture's sprite instead of scaling it by -1
fix the bug that exit layer can’t end SimpleAudioEngine
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAudio
closed #4903: Build libcurl.a with openssl
add android runtime
Merge pull request #6295 from samuele3hu/develop_fix

fix the bug that `EditBox` can’t response that ‘changed’,`ended` and ‘return’ event for lua
Update CHANGELOG [ci skip]
Update CHANGELOG [ci skip]
closed #4903: change HttpClientTest get test 3 to https protocol.
Merge pull request #6319 from boyu0/bug4903_build_libcurl_with_openssl

closed #4903: Build libcurl.a with openssl
[ci skip]
Fix lua project template crash on iOS5.1 device
issue #4904: fix iOS Image::safeToFile crashes when save jpg file.
closed #4904: use new Xcode command line tools to compile i386 arch libjpeg.a file, and shrink the lib file.