TableView updates to provide more touch input to CCTableViewDelegate
Merge branch 'gles20' of github.com:cocos2d/cocos2d-x into gles20
Merge branch 'gles20' of github.com:cocos2d/cocos2d-x into gles20
added lua support for linux platform
when user specified 'group' parameter, it should be parsed as an 'int'

Otherwise, when we do slicing, it would report type error.
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
* CCScrollView did not scroll correctly if the container items do not fill the ScrollView. The issue can be observed by modifying TableViewTestLayer::numberOfCellsInTableView(…) in the ExtensionsTest/TableViewTest project from 20 cells to 2 cells.
* Add documentation to CCTableViewDelegate methods.
* Fixed improper behavior of horizontally scrolling ScrollView
Merge pull request #1724 from FlowerpotGames/gles20

fixed #1599: CCScrollView and CCTableView updates.
Update AUTHORS
fixed #1600:update AppDelegate.cpp in xcode template
Merge pull request #1727 from minggo/iss1600_xcode_template

fixed #1600:update AppDelegate.cpp in xcode template
Merge branch 'gles20' of https://github.com/ivzave/cocos2d-x into linux-lua

Conflicts:
	scripting/lua/cocos2dx_support/LuaCocos2d.cpp
Updated eclipse project configurations for linux
Updated the submodule reference of cxx-generator.
Merge pull request #1728 from dumganhar/gles20

Updated the submodule reference of cxx-generator.
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
Merge pull request #1729 from CocosRobot/updategeneratedsubmodule_1354785766

cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
cosmetic AUTHORS