Add CCScrollView and CCTableView lua binding and related test samples
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into master_test
issue #2837:Add a newline
issue #2837: Modify platform compile config files
[master] Marmalade doesn't support chipmunk, define ENABLE_PHYSICS_BOX2D_DETECT in Armature instead.
[master] [Marmalde] Updating .mkf files.
Merge pull request #3786 from dumganhar/master

[master] Marmalade fixes
Merge pull request #3787 from Dhilan007/master

Bind CCEGLViewProtocol and CCEGLView for JSB.
[AUTO] : updating submodule reference to latest autogenerated bindings
Merge pull request #3788 from CocosRobot/updategeneratedsubmodule_1380031200

[AUTO] : updating submodule reference to latest autogenerated bindings[ci skip]
[master] Windows compilation fix.
Merge pull request #3789 from dumganhar/master

[master] Windows compilation fix.
issue #2837: Modify some api and variables format
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into master_test
issue #2837: Modify HelloLua project.pbxproj
Merge pull request #3784 from samuele3hu/master_test

issue #2837: Add CCScrollView and CCTableView lua binding, and add releated test samples
[AUTO] : updating submodule reference to latest autogenerated bindings
Merge pull request #3790 from CocosRobot/updategeneratedsubmodule_1380076576

[AUTO] : updating submodule reference to latest autogenerated bindings
issue #2837: Modify tojs/cocos2dx_extension.ini to skip some functions
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into master_test