Merge branch 'master' into Android
add cocos2d-x version2.1.4
Merge branch 'master' into Android