fixed #2217: Using CCLabelAtlas instead of CCLabelTTF to show FPS.
fixed #2217: Format codes in CCDirector::createStatsLabel.
issue #2103 add menu test lua sample
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into MenuTest
issue #2103 add a newline to CCInterger.pkg
issue #2217: Revert changes in CCPlatformMacro.h.
issue 2217: Removing unused fps_image png data.
fixed #2217: Updating logic when m_bIgnoreContentScaleFactor is enabled.
issue 2217: Updating Make file and project configuration to add ccFPSImage.c.
fixed #2217: Updating the comment for FPS display by using CCLabelAtlas.
Updating cocos2dx/Android.mk.
Merge pull request #2619 from dumganhar/iss2217-atlas-fps

fixed #2217: Using CCLabelAtlas instead of CCLabelTTF to show FPS.
[AUTO] : updating submodule reference to latest autogenerated bindings
Merge branch 'MenuTest' of https://github.com/samuele3hu/cocos2d-x; branch 'master' of https://github.com/cocos2d/cocos2d-x into MenuTest
Merge pull request #2620 from CocosRobot/updategeneratedsubmodule_1369302025

[AUTO] : updating submodule reference to latest autogenerated bindings
Merge branch 'MenuTest' of https://github.com/samuele3hu/cocos2d-x; branch 'master' of https://github.com/cocos2d/cocos2d-x into MenuTest
Merge pull request #2621 from samuele3hu/MenuTest

issue #2103: Add menu test sample of testlua
Fixed setHeader while Android had problems with stringstreams.
Merge pull request #2623 from zynga/XMLHttpRequest_cchttpclient

fixed #2092: Fixed setHeader while Android had problems with stringstreams.
remove the un-used static variable in PluginUtilsIOS