Feature #3515: Code implementation done, test on Android fail
Merge branch 'develop' of https://github.com/pandamicro/cocos2d-html5 into develop