Add www server, servlets and web-resources
Fix merge web-server to master