Encoding modified.
Merge branch 'master' of https://github.com/strebulyaev/itcourse

Conflicts:
	test1/WEB-INF/web.xml