asd
Merge branch 'master' of
https://github.com/olegZastavnyi/TestRepository.git

Conflicts:
	src/main/webapp/WEB-INF/web.xml