MailTests1
Merge branch 'dev'

Conflicts:
	.idea/libraries/libs.xml
MailTests1