Update Cocos2d-console
Merge branches 'master' and 'master' of https://github.com/cocos2d/cocos2d-js
Merge pull request #431 from pandamicro/master

Update Cocos2d-console