Merge pull request #898 from dingpinglv/develop

Merge develop to master branch
Merge pull request #1 from cocos2d/master

Master
fix the bug of cpGroup in segment query and nearest query
Merge pull request #910 from joshuastray/fix-query-on-mac-osx

Fix query on mac osx