Added http-servermodus
Merge remote-tracking branch 'origin/master'