update version
remove unneeded codes
In Mac OS X 10.9 and Xcode 5.1, it is a warning "Declaration shadows a local variable" in a new ios/mac project.
Merge commit 'refs/pull/6230/head' of git://github.com/cocos2d/cocos2d-x into pull/6230
Compilation error fix in CCQuadCommand.cpp
Merge pull request #6234 from dumganhar/pull/6230

Merge PR #6230: Quadcommand remove unneeded codes
Merge pull request #6232 from gaoxiaosong/develop

A warning fix in cpCollision.c
Update AUTHORS [ci skip]
Small fix in CCRenderer.cpp, 'auto i = 0' -> 'ssize_t i = 0' in for loop
Merge pull request #6236 from dumganhar/develop

Small fix in CCRenderer.cpp, 'auto i = 0' -> 'ssize_t i = 0' in for loop