-
Merge branch 'master' of github.com:EugenePismenniy/SpringPro3MVC

Conflicts:
	pom.xml