Feature #4010: Add retina display functions
Feature #4010: Make isRetinaEnabled check more realistic
Merge branches 'master' and 'master' of https://github.com/cocos2d/cocos2d-js
update submodule
Merge pull request #98 from lihex/master

update submodule
Issue #4277: update build.xml of MoonWarriors
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js into Iss4277_ReleaseV3.0
Issue #4277 : Change the menu performance of template.
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Update Cocos2d-html5
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Merge pull request #99 from pandamicro/master

Feature #4010: Add retina display functions
Issue #4294: Move jsb_boot.js load into ScriptingCore for making it opaque to developer
Merge pull request #101 from SmallAiTT/master

Issue #4277 : Change the menu performance of template.
Merge pull request #100 from pandamicro/master

Issue #4294: Move jsb_boot.js load into ScriptingCore for making it opaq...
Merge pull request #102 from chuanweizhang2013/master

update win32 simulator
fix the ndk_module path
Merge pull request #103 from lihex/master

fix the ndk_module path
add setup.py
Merge pull request #104 from lihex/master

add setup.py