Fixed #5943: Fix a issue of cached texture loading
Remove ActionTimelineTest for JSB
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop
Issue #5970: Add MediaPlayer.framework to avoid linking issue
Update submodules
Update Docs and Engine Version
Update html5 engine
Update Authors
Merge pull request #832 from joshuastray/develop

Feature #5972 : add build_native.py for android template
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop
Merge pull request #831 from pandamicro/develop

Fixed #5943: Fix a issue of cached texture loading
Update plugin-x
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop
Merge pull request #833 from pandamicro/develop

Update plugin-x