Merge pull request #2862 from dumganhar/master

Fixing a bug that vs express can't work.
Adding travis-ci build for emscripten port.
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x