Merge pull request #1 from chukong/master

合并主线Mater
Merge pull request #2 from chukong/master

merge
Merge pull request #369 from yinjimmy/develop

update code from master branch
修复player下调用CCImage::saveToFile 导致断言崩溃问题, CCRenderTexture可以保存到文件
Merge pull request #370 from justbilt/develop

修复player下调用CCImage::saveToFile 导致断言崩溃问题, CCRenderTexture可以保存到文件
Merge pull request #3 from chukong/master

合并原版本
print shader compile error info

print shader compile error info
Merge pull request #382 from zhanglei0321/patch-1

print shader compile error info
disable debug log output buffer
rename player filename
Merge branch 'master' of github.com:chukong/quick-cocos2d-x
rename player mac filename
rename player proj.win filename
update player
update player mac
update setup.app
update .gitignore
update luajit related scripts and libs
update scripts
update player win32