replace http and https
merge for https handling

Merge branch 'master' of https://github.com/zatricion/Spiderweb