....
Merge branch '2.1.4' of https://github.com/Zentertain/cocos2d-x into 2.1.4