pull
theirs
webxml
Merge branch 'master' into ET-dev
Created new account pages, created newUserServlet