fixed #1876:  CCScale9Sprite::setColor(...), setOpacity(...) are broken.
Merge pull request #2373 from dumganhar/iss1876-9sprite-setColor

fixed #1876:  CCScale9Sprite::setColor(...), setOpacity(...) are broken.
Fix CCPhysicsSprite getPosition variants

CCPhysicsSprite was overriding only some of the getPosition
methods on a node resulting in, for example, getPositionX
and getPositionY not working for physics nodes.

This change also makes this overloads shared between box2d
and chipmunk implementations.
Fix typo in make-all-linux-project.sh
Enable easy swithing between Box2D and chipmunk in linux and nacl

The ENABLE_BOX2D/ENABLE_CHIPMUNK defines were previously
hardcoded in the Makefiles.  Now you get chipmunk by default
on both platforms and can enble Box2D by setting USE_BOX2D in
your environment.

Also remove erroneous -D__CC_PLATFORM_FILEUTILS_CPP__ and
-D__CC_PLATFORM_IMAGE_CPP__ from linux Makefiles.  These should
never be defined globally like this.
Merge pull request #2231 from sbc100/physics_fixes

fixed #2055: Physics fixes.
1) Fix CCPhysicsSprite getPosition variants …
CCPhysicsSprite was overriding only some of the getPosition
methods on a node resulting in, for example, getPositionX
and getPositionY not working for physics nodes.

This change also makes this overloads shared between box2d
and chipmunk implementations.

2) Fix typo in make-all-linux-project.sh
3) The ENABLE_BOX2D/ENABLE_CHIPMUNK defines were previously
hardcoded in the Makefiles. Now you get chipmunk by default
on both platforms and can enble Box2D by setting USE_BOX2D in
your environment.

Also remove erroneous -D__CC_PLATFORM_FILEUTILS_CPP__ and
-D__CC_PLATFORM_IMAGE_CPP__ from linux Makefiles. These should
never be defined globally like this.
Update AUTHORS
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
Merge pull request #2377 from CocosRobot/updategeneratedsubmodule_1366077719

cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
Remove the protocol IAP Online
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
Resolve the ndk build error.
Merge pull request #2379 from natural-law/master

issue #1723 : Remove the protocol IAP Online.
Merge remote-tracking branch 'cocos2d-x/master'