Add scale ratio to button touchdown
Merge branch 'develop' into fix-button-scale-to
update If Construct
amendment incorrect use of macro
fix create job state
Merge commit 'refs/pull/4085/head' of git://github.com/cocos2d/cocos2d-x into iss3619

Conflicts:
	extensions/GUI/CCControlExtension/CCControlButton.cpp
Merge pull request #4997 from dumganhar/iss3619

Merge PR #4085: Fix of ControlButton doesn't support to set scale ratio of touchdown state
Update AUTHORS [ci skip]
Update CHANGELOG [ci skip]
Merge pull request #4995 from Dhilan007/develop_crash

amendment incorrect use of macro
[AUTO] : updating submodule reference to latest autogenerated bindings
Merge pull request #4999 from CocosRobot/updategeneratedsubmodule_1389238661

[AUTO] : updating submodule reference to latest autogenerated bindings
issue #3627, remove UICCLabelAtlas, add LabelAtlas::create() for GUI module
fixed #3627. There're no UICCLabelAtlas any more.
Merge pull request #5000 from walzer/remove_UICCLabelAtlas

Remove UICCLabelAtlas in GUI module
support [ci skip] command
[AUTO] : updating submodule reference to latest autogenerated bindings
Merge pull request #5001 from CocosRobot/updategeneratedsubmodule_1389243030

[AUTO] : updating submodule reference to latest autogenerated bindings
Merge pull request #5002 from heliclei/develop

support [ci skip] in commit message
fix WebSocket cannot send/receive more than 4096 bytes of data