Update samples/TestCpp to compatible with marmalade
update marmalade languages
fix doxygen rendering output of CCLayerGradient

Otherwise, the first line of CCLayerGradient is rendered with a box in
doxygen's output.
fix the doxygen warnings

cocos2d-x.git/extensions/network/HttpClient.h:64: warning: The following parameters of cocos2d::extension::CCHttpClient::setTimeoutForConnect(int value) are not documented:
  parameter 'value'
cocos2d-x.git/extensions/network/HttpClient.h:79: warning: argument 'timeout' of command @param is not found in the argument list of CCHttpClient::setTimeoutForRead(int value)
cocos2d-x.git/extensions/network/HttpClient.h:79: warning: The following parameters of cocos2d::extension::CCHttpClient::setTimeoutForRead(int value) are not documented:
  parameter 'value'
Merge pull request #1645 from fape/marmalade_language

fixed #1574: Update marmalade languages.
Merge pull request #1644 from fape/testcpp_marmalade

fixed #1575: Update samples/TestCpp to compatible with marmalade
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
issue #1564:work ok on linux
Merge pull request #1651 from minggo/gles20

issue #1564:work ok on linux
use macro CC_TARGET_OS_IPHONE instead of TARGET_OS_IPHONE and make xcode template work ok
Merge branch 'gles20' of https://github.com/minggo/cocos2d-x into gles20
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
Merge pull request #1652 from minggo/gles20

Gles20
Merge pull request #1647 from guanqun/fix-doxygen

Fix doxygen related errors and warnings
give a guide information to run Box2dTest
Merge pull request #1653 from minggo/gles20

give a guide information to run Box2dTest
fixed #1576: Sync CCBReader to latest version, CCString* --> std::string, CocosBuilderTest crash fixes.
Merge pull request #1654 from dumganhar/gles20

fixed #1576: Sync CCBReader to latest version, CCString* --> std::string, CocosBuilderTest crash fixes.
fixed #1576: Updated CocosBuilderTest.
Merge pull request #1655 from dumganhar/gles20

fixed #1576: Updated CocosBuilderTest.