Extracted webserver from main Server to WebServer
Merge branch 'extract_webapp' into develop