go to work
Merge remote-tracking branch 'origin/master'

Conflicts:
	pom.xml
	src/main/webapp/WEB-INF/mvc-dispatcher-servlet.xml
Merge branch 'master' of https://github.com/SergeiDosWork/kacit
4