solve check out conflict with 'web' file
Merge branch 'master' of https://github.com/didclab/stork.git
Enable HTTS connection
Merge pull request #23 from TimDu/httpmodule

Merging changes to HTTP module.