fixed a bug that was causing x86_64 tests to crash while loading
ccbuilder files
fix syntax error;
Merge pull request #2360 from tiantian20007/backToUpsteram

fix syntax error;
Update AUTHORS
Fixing an issue of out of bound in CCTableView.cpp.
Merge pull request #2363 from dumganhar/master

Fixing an issue of out of bound in CCTableView.cpp.
Merge branch 'master' of https://github.com/billy1380/cocos2d-x into billy1380-master
fixed #2051: TestCpp/ExtensionsTest/CocosbuilderTest crashes under x86_64 target.
fixed #2051: Comment update, int ~> intptr_t.
Merge pull request #2364 from dumganhar/iss2051-builder-crash-64bit

fixed #2051: TestCpp/ExtensionsTest/CocosbuilderTest crashes under x86_64 target.
Merge remote-tracking branch 'cocos2d-x/master'