Merge pull request #1 from cocos2d/master

Update from remote #1
Merge pull request #2 from cocos2d/master

Merge
Merge pull request #3 from cocos2d/master

Pull down
Modify ClippingNode Test, and activate it for canvas mode
Merge pull request #263 from pandamicro/master

Modify ClippingNode Test, and activate it for canvas mode