Merge branch 'feature/fix_travis' into develop
Merge pull request #3 from changyou/master

merge changyou/master
Merge branch 'master' into develop
Merge remote-tracking branch 'master/master' into develop
fix travis
continue fix travis
Merge pull request #15 from bitdewy/hotfix/fix_travis

Hotfix/fix travis