30.2
Merge branch 'kirill' of https://github.com/nromanen/ch018-2team- into kirill

Conflicts:
	src/main/webapp/WEB-INF/templates/layouts/librarian/users.jsp
10.02
merge k->m e->m
after merge