Merge branch 'master' into develop
bump version
can not load https
Merge pull request #4 from sue445/develop

can not http