mail
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	SvitlaCMF/Mod/Apanel/Controller.php