add to web.xml error-page
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/java/task11/webapp/admin/AddUser.java
fix checkboxes for teams pages