Merge branch 'develop' into develop_nutty_modify_framework_newrender_modify_projectfiles
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
[AUTO] : updating submodule reference to latest autogenerated bindings
Merge pull request #4680 from CocosRobot/updategeneratedsubmodule_1388046023

[AUTO] : updating submodule reference to latest autogenerated bindings
Merge pull request #4679 from dabingnn/develop_FixTestCase_labelTestNew

Develop fix test case label test new
modify coco action with new coding rule
change QuadCommand variable to class member.
modify coco action with new coding rule
Merge branch 'develop' into develop_nutty_modify_framework_newrender_modify_projectfiles
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop

Conflicts:
	tools/bindings-generator
Merge pull request #4 from liamcindy/MergeCocos2d_3.0

modify coco action with new coding rule
change comment
Merge pull request #4671 from nutty898/develop_nutty_modify_framework_newrender_modify_projectfiles

Add refresh layout method and uses Range loop for GUI codes
Merge branch 'develop' into #3457
Modify actionnode
[AUTO] : updating submodule reference to latest autogenerated bindings
Fixes failed to  build android.
Merge pull request #4681 from CocosRobot/updategeneratedsubmodule_1388048641

[AUTO] : updating submodule reference to latest autogenerated bindings
Merge branch 'develop' into develop_nutty_modify_framework_newrender_modify_projectfiles
fixed #3457 continue to fixes failed to build.