Merge pull request #431 from pandamicro/master

Update Cocos2d-console
Update Cocos2d-x