Merge pull request #10 from cocos2d/master

update js
fix android crash
Merge pull request #11 from chuanweizhang2013/master

fix android crash
Merge pull request #12 from cocos2d/master

merge from cocos
set deployment target
Merge pull request #13 from chuanweizhang2013/master

set deployment target
add support for reverse orientation for android
Merge pull request #14 from bofeng-song/master

add support for reverse orientation for android
fit portrait for js
show uploading file in play scene
fix potential problem
remove inner function from header file
Merge pull request #16 from chuanweizhang2013/master

fit portrait for js
Merge pull request #17 from cocos2d/master

update js
Issue #5215: Modify some index list
Merge pull request #15 from bofeng-song/master

show uploading file in play scene
Merge pull request #18 from cocos2d/master

update js
Merge pull request #382 from joshuastray/master

fixed #5213：add cc.Node.prototype.getBoundingBoxToWorld and affinetransform api
Issue #5106: Restore error modification
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js