fix typo
update sample touch
fix: glScissor on rmbp
fix: crash sometimes on OSX
1. show console as default
2. add shortcut for clearing log
move
update player for windows
improve touch capturing phase
fix DrawNodeEx
fix template run-mac.sh
将CCArmatureDataManager的getArmatureData和getAnimationData绑定到lua
Merge pull request #327 from ZhaoTianze/develop

将CCArmatureDataManager的getArmatureData和getAnimationData绑定到lua
Merge branch 'master' into feature/test
Merge branch 'develop' of https://github.com/chukong/quick-cocos2d-x into develop
Merge pull request #329 from yinjimmy/develop

move
为CCArmature增加绑定动画播放的相关回调方法
Merge pull request #330 from ZhaoTianze/develop

为CCArmature增加绑定动画播放的相关回调方法
Merge branch 'develop' of https://github.com/chukong/quick-cocos2d-x into develop
update player for mac
Merge pull request #333 from yinjimmy/develop

move