Merge pull request #26 from cocos2d/master

update cocos2d-js
Merge pull request #29 from cocoscodeide/master

update cocos2d-js
add win prebuilt
Merge pull request #27 from chuanweizhang2013/master

update cocos2d-js template
Merge pull request #428 from cocoscodeide/master

update win32 prebuilt
Update Cocos2d-x
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Merge pull request #429 from pandamicro/master

Update Cocos2d-x
Merge pull request #430 from joshuastray/master

issue #5253: fix invalid native object bug in AsstesManagerTest
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
issue #5281: remove UIText renaming