Merge branch 'develop' into newRenderer
Merge branch 'newRenderer' of github.com:ricardoquesada/cocos2d-x into newRenderer