Merge pull request #2 from cocos2d/master

merge
Merge pull request #24 from cocos2d/master

update cocos2d-js
[AUTO] : updating jsbinding automatically
[AUTO] : updating jsbinding automatically
[AUTO] : updating jsbinding automatically
Merge pull request #25 from cocos2d/master

update cocos2d-js
Sync -x
add libNetwork.lib for win32 template
add pre reference for libnetwork
Merge pull request #314 from joshuastray/master

add libNetwork.lib for win32 template
[AUTO] : updating jsbinding automatically
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Merge pull request #316 from dingpinglv/master

Update the reference of cocos2d-html5 and cocos2d-x
[AUTO] : updating jsbinding automatically
Merge pull request #313 from pandamicro/master

Sync -x
Merge pull request #307 from CocosRobot/update_js_bindings_1398319816

[AUTO] : updating jsbinding automatically
Merge pull request #310 from CocosRobot/update_js_bindings_1398327765

[AUTO] : updating jsbinding automatically
Merge pull request #312 from CocosRobot/update_js_bindings_1398334367

[AUTO] : updating jsbinding automatically
Merge pull request #315 from CocosRobot/update_js_bindings_1398394755

[AUTO] : updating jsbinding automatically
[AUTO] : updating jsbinding automatically