Merge branch 'master' into 4thWeekNikolay2

Conflicts:
	pom.xml