Add settings
IMPORTANT -- Fixed issue unable to connect by client
Change project name in web.xml
Fixed merge conflicts
changed .project
changed .project