fix debug define.
Swift compilation changes.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-iphone into develop
Merge branch 'develop' of github.com:spritebuilder/cocos2d-swift into develop
Fix Divergence of animation over time when missing Zero time keyframes.
Merge pull request #814 from jtwigg/develop

fix debug define & animation Divergence.
fixing animations out of sync error.
animation fixes for tweening blends sync problem.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-iphone into develop
Merge pull request #836 from jtwigg/develop

Animation Sync Errors.
Ups the version of Cocos2D to 3.1.1 and fixes printing of version number
Fixes templates