Merge pull request #1 from cocos2d/develop

Pull down updates from cocos2d:develop
Merge pull request #2 from cocos2d/develop

Pull down updates from cocos2d:develop
Closed #3369 : Rewrite logic of NO_BORDER adaptation
Merge pull request #1309 from pandamicro/develop

Closed #3369 : Rewrite logic of NO_BORDER adaptation