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 #389 from chukong/develop

Develop
Merge pull request #387 from GamaLabs/master

修正 ui.EditBox 在初始化的时候，如果不提供 listener 监听的话，初始化会失败的问题
fix multi-touches
update sample touch
update luajit library, set LUA_IDSIZE = 512
update sample ios-icon
fix proj.android
update sample touch proj.android
update player mac
update player win32
Merge branch 'master' of github.com:chukong/quick-cocos2d-x
update framework zip
update player mac
sync with chukong's master