Webserver and master merged