Modified   pbc
Merge branch 'master' of https://github.com/miaodadao/3party
import cocos2dx-common from https://github.com/stubma/cocos2dx-common.git
防止crlf捣乱
防止crlf捣乱