Merge pull request #1 from cocos2d/master

merge
Issue #4608 Fixed a bug that cc.DIRECTOR_PROJECTION_3D is error
Merge pull request #262 from VisualSJ/master

Issue #4608 Fixed a bug that cc.DIRECTOR_PROJECTION_3D is error