commit for android
Merge branch 'master' of github.com:acwind/TypingIt-Cocos2d-x