ignore local properties
Merge branch 'zrong' of github.com:zrong/quick-cocos2d-x into zrong