Merge pull request #22 from cocos2d/master

update js
Merge pull request #28 from cocoscodeide/master

update cocos2d-js
add play ui
Merge branch 'master' of https://github.com/chuanweizhang2013/cocos2d-js
move rt res path
move rt res path
Merge branch 'master' of https://github.com/chuanweizhang2013/cocos2d-js
Merge pull request #23 from cocos2d/master

update js
mac project
Merge branch 'master' of https://github.com/cocoscodeide/cocos2d-js
Merge pull request #24 from chuanweizhang2013/master

update cocos2d-js
prebuild exclude win
Merge branch 'master' of https://github.com/cocoscodeide/cocos2d-js
Merge pull request #25 from chuanweizhang2013/master

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

update cocos2d-js template