Merge pull request #6960 from kicktheken/3.1-hotfix

fix layout constant syntax error
* Set COCOS2D_VERSION to 3.1.1
Merge pull request #6992 from Teivaz/3.1-hotfix

* Set COCOS2D_VERSION to 3.1.1