Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1564-update-tests

Conflicts:
	samples/TestCpp/Classes/tests.h
Merge pull request #1612 from dumganhar/iss1564-update-tests

issue #1564: Added ClippingNodeTest.
issue #1564:add CClippingNodeTest
Merge pull request #1613 from minggo/gles20

add ClippingNodeTest
issue #1564: Updated ClippingNodeTest.
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1564-update-tests

Conflicts:
	samples/TestCpp/Classes/ClippingNodeTest/ClippingNodeTest.h
Merge pull request #1614 from dumganhar/iss1564-update-tests

issue #1564: Updated ClippingNodeTest.
issue #1564:create stencil buffer for TestCpp
Merge pull request #1615 from minggo/gles20

create stencil buffer for TestCpp
issue #1564: Updated ClippingNodeTest.
issue #1564:fix a logical erroe in CCRotationTo
Merge pull request #1616 from minggo/gles20

fix a logical erroe in CCRotationTo
issue #1564: Fix crash of ParticlesTest.
Merge pull request #1617 from dumganhar/iss1564-update-tests

issue #1564: Fix crash of ParticlesTest.
Updated the submodule reference of cocos2d-js-tests and cxx-generator.
Merge pull request #1618 from dumganhar/gles20

Updated the submodule reference of cocos2d-js-tests and cxx-generator.
Merge pull request #1589 from funkaster/gles20

fixed #1570: Improves the debugger for JSBindings.
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
Merge pull request #1619 from CocosRobot/updategeneratedsubmodule_1353505578

cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
add box2d rope path to marmalade project