fff
Merge branch 'master' of
https://github.com/mzubok/issuetracker_sergei_doroshenko.git

Conflicts:
	src/main/webapp/WEB-INF/dispatcher-servlet.xml