[readme] update
[merge] origin/develop - travis.yml
[fix merge conflict]