Merge pull request #3 from dabing1022/master

merge master
Merge pull request #4 from dualface/develop

merge the official update
Merge pull request #5 from dabing1022/develop

merge the develop
Merge pull request #6 from dualface/develop

merge the official update
fix bug about invalid "write debug log to file" 

修复：mac版Player在禁用"Show Debug Console"后, "Write Debug Log to File"无效，见 [Issue #221](https://github.com/dualface/quick-cocos2d-x/issues/221#issuecomment-32004473)
Merge pull request #223 from dabing1022/ChildhoodAndyDev

fix bug about invalid "write debug log to file"
tolua
CCScale9Sprite::setBlendFunc
CCScale9Sprite::getBlendFunc
test
vs2012 release config
Merge branch 'develop' of https://github.com/huangwei1024/quick-cocos2d-x into develop
Merge pull request #229 from huangwei1024/develop

vs2012 release config
Merge pull request #226 from skyblue/develop_origin

tolua CCScale9Sprite::setBlendFunc && CCScale9Sprite::getBlendFunc
add newMaskSprite and newTiledBatchNode methods to display.lua
fix typeo
Merge remote-tracking branch 'dualface/develop' into develop
merge zrong/develop