+ [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
add android runtime
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.
Update the reference of submodule cocos2d-console.
Merge pull request #6327 from boyu0/bug4904_Image_safeToFile_crashes_ios

closed #4904: fix ios Image::saveToFile crashes when save jpg file.
[ci skip]
Merge pull request #6328 from natural-law/develop

Update the reference of submodule cocos2d-console.
Merge pull request #6326 from chuanweizhang2013/luaruntime

update android runtime
Merge pull request #6324 from kicktheken/develop

Fix lua project template crash on iOS5.1 device
[ci skip]
[ci skip]
Merge pull request #6262 from Mazyod/develop-editbox-mac-enhancements

Mac Editbox Text Font and Placeholder features
Update CHANGELOG [ci skip]
Update AUTHORS [ci skip]
Update AUTHORS [ci skip]
Merge remote-tracking branch 'upstream/develop' into develop

* upstream/develop:
  Update AUTHORS [ci skip]
  Update AUTHORS [ci skip]
  Update CHANGELOG [ci skip]
  [ci skip]
  [ci skip]
  [ci skip]
  Update the reference of submodule cocos2d-console.
  closed #4904: use new Xcode command line tools to compile i386 arch libjpeg.a file, and shrink the lib file.
  issue #4904: fix iOS Image::safeToFile crashes when save jpg file.
  Fix lua project template crash on iOS5.1 device
  add android runtime
  small indentation fix
  + [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