Merge branch 'master' of https://github.com/Andrey90/luchkovsky-qs6

Conflicts:
	src/test/java/pak/TestEmailTest.java